Merge pull request #356 from yanokwa/google-submission

Google submissions do allow underscores

pyxform/tests/xls2json_tests.py

@@ -203,19 +203,6 @@ def test_choice_filter_choice_fields(self):
         ]
         self.assertEqual(choice_filter_survey.to_json_dict()["children"], expected_dict)
 
-    def test_underscore_warnings(self):
-        """Raise warnings incase there are underscores in column names"""
-        warnings = []
-        parse_file_to_json(utils.path_to_text_fixture("hidden.xls"), warnings=warnings)
-        self.assertGreater(len(warnings), 0)
-        warning = (
-            "Google Sheets submissions don't allow underscores in the "
-            "column name. If you intend to use Google Sheets "
-            "submissions, replace underscores with hyphens in the "
-            "following names: hidden_test"
-        )
-        self.assertIn(warning, warnings)
-
 
 class CsvReaderEquivalencyTest(TestCase):
     def test_equivalency(self):

pyxform/tests/xlsform_spec_test.py

@@ -98,7 +98,7 @@ def runTest(self):
         warnings = []
         pyxform.xls2json.parse_file_to_json(path_to_excel_file, warnings=warnings)
         self.assertEquals(
-            len(warnings), 22, "Found " + str(len(warnings)) + " warnings"
+            len(warnings), 21, "Found " + str(len(warnings)) + " warnings"
         )
 
 

pyxform/xls2json.py

@@ -590,8 +590,6 @@ def workbook_to_json(
 
     # Rows from the survey sheet that should be nested in meta
     survey_meta = []
-    # Google Sheets submissions don't allow underscores in the column name
-    names_with_underscores = []
 
     for row in survey_sheet:
         row_number += 1
@@ -621,8 +619,6 @@ def workbook_to_json(
         question_type = row.get(constants.TYPE)
         question_name = row.get(constants.NAME)
 
-        if question_name and "_" in question_name:
-            names_with_underscores.append(question_name)
         if not question_type:
             # if name and label are also missing,
             # then its a comment row, and we skip it with warning
@@ -1223,13 +1219,6 @@ def replace_prefix(d, prefix):
         # Put the row in the json dict as is:
         parent_children_array.append(row)
 
-    if names_with_underscores:
-        warnings.append(
-            "Google Sheets submissions don't allow underscores in the "
-            "column name. If you intend to use Google Sheets submissions, "
-            "replace underscores with hyphens in the following names: "
-            "{}".format(", ".join(names_with_underscores))
-        )
     if len(stack) != 1:
         raise PyXFormError(
             "Unmatched begin statement: "