Fix some warnings with regex (#485)

* Fix some warnings with regex

* Refactor names of regular expressions

* Move global regex to locale

* Small updates

* Refactor some regexs into common code.

Author: Craig Cornelius

testgen/common.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+import  re
+
+# Commonly used regular expressions and other code
+RE_BLANK_LINE = re.compile(r"^\s*$")
+RE_COMMENT_LINE = re.compile(r"^\s*#")

testgen/generators/lang_names.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
+import common
+
 import os
 import json
 import re
 import logging
 from generators.base import DataGenerator
 
-reblankline = re.compile("^\s*$")
-
-
 class LangNamesGenerator(DataGenerator):
     json_test = {"test_type": "lang_names"}
     json_verify = {"test_type": "lang_names"}
@@ -57,7 +56,6 @@ def languageNameDescr(self):
 
     def generateLanguageNameTestDataObjects(self, rawtestdata):
         # Get the JSON data for tests and verification for language names
-        recommentline = re.compile("^\s*#")
         count = 0
 
         jtests = []
@@ -68,7 +66,7 @@ def generateLanguageNameTestDataObjects(self, rawtestdata):
         num_samples = len(test_lines)
         max_digits = self.computeMaxDigitsForCount(num_samples)
         for item in test_lines:
-            if not (recommentline.match(item) or reblankline.match(item)):
+            if not (common.RE_COMMENT_LINE.match(item) or common.RE_BLANK_LINE.match(item)):
                 test_data = self.parseLanguageNameData(item)
                 if test_data == None:
                     logging.debug(

testgen/generators/localeDisplayNames.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
+import common
+
 import os
 import json
 import re
 import logging
 from generators.base import DataGenerator
 
-reblankline = re.compile("^\s*$")
-
-
 class LocaleNamesGenerator(DataGenerator):
     json_test = {"test_type": "lang_names"}
     json_verify = {"test_type": "lang_names"}
@@ -59,8 +58,6 @@ def languageNameDescr(self):
 
     def generateLanguageNameTestDataObjects(self, rawtestdata):
         # Get the JSON data for tests and verification for language names
-        recommentline = re.compile("^\s*#")
-
         set_locale = re.compile(r"@locale=(\w+)")
         set_languageDisplay = re.compile(r"@languageDisplay=(\w+)")
 
@@ -78,7 +75,7 @@ def generateLanguageNameTestDataObjects(self, rawtestdata):
         language_display = 'standard'
 
         for item in test_lines:
-            if not (recommentline.match(item) or reblankline.match(item)):
+            if not (common.RE_COMMENT_LINE.match(item) or common.RE_BLANK_LINE.match(item)):
 
                 locale_match = set_locale.match(item)
                 if locale_match: