Localization 1006 (#490)

* LOCALIZATION-1006: adding new rules to regex.

* LOCALIZATION-1006: Fix in regex.

* LOCALIZATION-1006: FutureWarning fix.

* LOCALIZATION-1006: Test to remove FutureWarning

* LOCALIZATION-1006: Updating flake8 and following pep8 style

pootle/apps/pootle_translationproject/urls.py

@@ -22,45 +22,46 @@
 urlpatterns = [
     # Admin views
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)" r"/admin/permissions/",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)" r"/admin/permissions/",
         admin_permissions,
         name="pootle-tp-admin-permissions",
     ),
     # Translation
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/"
-        r"translate/(?P<dir_path>(.*/)*)?$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"translate/(?P<dir_path>([^<>]*/)*)?$",
         TPTranslateView.as_view(),
         name="pootle-tp-translate",
     ),
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/"
-        r"translate/(?P<dir_path>(.*/)*)(?P<filename>.*\.*)$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"translate/(?P<dir_path>([^<>]*/)*)(?P<filename>.*\.*)$",
         TPTranslateStoreView.as_view(),
         name="pootle-tp-store-translate",
     ),
     # Export view
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/"
-        r"export-view/(?P<dir_path>(.*/)*)?$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"export-view/(?P<dir_path>([^<>]*/)*)?$",
         TPExportView.as_view(),
         name="pootle-tp-export",
     ),
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/"
-        r"export-view/(?P<dir_path>(.*/)*)(?P<filename>.*\.*)$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"export-view/(?P<dir_path>([^<>]*/)*)(?P<filename>.*\.*)$",
         TPExportStoreView.as_view(),
         name="pootle-tp-store-export",
     ),
     # Browser
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/" r"(?P<dir_path>(.*/)*)?$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"(?P<dir_path>([^<>]*/)*)?$",
         TPBrowseView.as_view(),
         name="pootle-tp-browse",
     ),
     url(
-        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/]*)/"
-        r"(?P<dir_path>(.*/)*)(?P<filename>.*\.*)?$",
+        r"^(?P<language_code>[^/]*)/(?P<project_code>[^/><]*)/"
+        r"(?P<dir_path>([^<>]*/)*)(?P<filename>.*\.*)?$",
         TPBrowseStoreView.as_view(),
         name="pootle-tp-store-browse",
     ),

pootle/middleware/errorpages.py

@@ -52,7 +52,7 @@ def log_exception(request, exception, tb):
 
     try:
         request_repr = repr(request)
-    except:
+    except Exception:
         request_repr = "Request repr() unavailable"
 
     msg_args = (str(exception.args[0]), tb, request_repr)
@@ -93,7 +93,7 @@ def handle_exception(request, exception, template_name):
         return HttpResponseServerError(
             render_to_string(template_name, context=ctx, request=request)
         )
-    except:
+    except Exception:
         # Let's not confuse things by throwing an exception here
         pass
 

requirements/_lint.txt

@@ -1,6 +1,6 @@
 # Linting tools
 
 black==19.10b0
-flake8==3.4.1
+flake8==4.0.1
 isort==4.3.21
 pylint==2.4.4

setup.py

@@ -120,7 +120,7 @@ def build_mo(self):
                     command = ["msgfmt", "--strict", "-o", mo_filename, po_filename]
                 try:
                     subprocess.check_call(command, stderr=subprocess.STDOUT)
-                except subprocess.CalledProcessError as e:
+                except subprocess.CalledProcessError:
                     error_occured = True
                 except Exception as e:
                     log.warn("%s: skipping, running msgfmt failed: %s", lang, e)