Merge pull request #147 from kobotoolbox/146-fix-xlsform-import

Update pandas syntax for importing XLS

environment.yml

@@ -21,6 +21,7 @@ dependencies:
     - djangorestframework==3.12.4
     - gunicorn==20.1.0
     - huey==2.3.2
+    - openpyxl==3.0.9
     - psycopg2==2.8.6
     - sentry-sdk==1.0.0
     - requests==2.25.1

equitytool/xls2csv.py

@@ -5,12 +5,27 @@
 class Converter(object):
 
     def set_excel(self, io):
-        self.sheets = pd.read_excel(io, sheetname=None)
+        # "Specify None to get all sheets"
+        # https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.read_excel.html
+        self.sheets = pd.read_excel(io, sheet_name=None)
 
     def set_settings(self, **kwargs):
-        settings = self.sheets['settings']
-        for k, v in kwargs.items():
-            settings[k][0] = v
+        """
+        Add settings from kwargs to the XLSForm settings sheet, overwriting
+        any existing settings with the same names
+        """
+
+        try:
+            settings = self.sheets['settings']
+        except KeyError:
+            # No settings sheet exists yet; make a new one
+            self.sheets['settings'] = pd.DataFrame.from_dict(
+                {k: [v] for k, v in kwargs.items()}
+            )
+        else:
+            # Update existing settings sheet
+            for k, v in kwargs.items():
+                settings[k][0] = v
 
     def get_csv(self):
         result = ''