From a225d34a6f889f95ea56fc4272641477299a4f3e Mon Sep 17 00:00:00 2001 From: Andre D Date: Wed, 12 Dec 2012 15:09:22 -0500 Subject: [PATCH] wiki: Move space replace into normalize. --- r2/r2/controllers/validator/wiki.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/r2/r2/controllers/validator/wiki.py b/r2/r2/controllers/validator/wiki.py index 24f88ca5c..7003681c8 100644 --- a/r2/r2/controllers/validator/wiki.py +++ b/r2/r2/controllers/validator/wiki.py @@ -172,6 +172,9 @@ def normalize_page(page): # Ensure there is no side effect if page is None page = page or "" + # Replace spaces with underscores + page = page.replace(' ', '_') + # Case insensitive page names page = page.lower() @@ -206,14 +209,11 @@ class VWikiPageName(Validator): except UnicodeEncodeError: return self.set_error('INVALID_PAGE_NAME', code=400) - if ' ' in page: - page = page.replace(' ', '_') + page = normalize_page(page) if page and not page_match_regex.match(page): return self.set_error('INVALID_PAGE_NAME', code=400) - page = normalize_page(page) - # If no page is specified, give the index page page = page or "index"