make requested changes

Author: joshuaberetta

src/formpack/utils/kobo_locking.py

@@ -53,9 +53,11 @@ def get_kobo_locking_profiles(xls_file_object: io.BytesIO) -> list:
         return
 
     locks = survey_dict[KOBO_LOCK_SHEET]
-    # Get a unique list of profile names if they have at least one value set to
-    # 'locked' from the matrix of values
-    profiles = set(itertools.chain(*[lock.keys() for lock in locks]))
+
+    # Get a unique list of profile names
+    profiles = set()
+    for lock in locks:
+        profiles.update(lock.keys())
 
     # So some basic validation of locking profiles
     profiles = _validate_locking_profiles(profiles)
@@ -78,7 +80,7 @@ def get_kobo_locking_profiles(xls_file_object: io.BytesIO) -> list:
 
     return list(locking_profiles.values())
 
-def revert_kobo_lock_structre(content: dict) -> None:
+def revert_kobo_lock_structure(content: dict) -> None:
     """
     Revert the structure of the locks to one that is ready to be exported into
     an XLSForm again -- the reverse of `get_kobo_locking_profiles`

src/formpack/utils/replace_aliases.py

@@ -12,6 +12,7 @@
 
 from .future import iteritems, OrderedDict
 from .string import str_types
+from ..constants import KOBO_LOCK_ALL
 
 # This file is a mishmash of things which culminate in the
 # "replace_aliases" method which iterates through a survey and
@@ -301,10 +302,13 @@ def replace_aliases_in_place(content, allowed_types=None):
                          ' first been parsed through "expand_content".')
 
     if settings:
-        content['settings'] = dict([
-            (
-                kobo_specific_sub(settings_header_columns.get(key, key)),
-                pyxform_aliases.yes_no.get(val, val),
+        _settings = {}
+        for key, val in settings.items():
+            _key = kobo_specific_sub(settings_header_columns.get(key, key))
+            _val = (
+                pyxform_aliases.yes_no.get(val, val)
+                if _key == KOBO_LOCK_ALL
+                else val
             )
-            for key, val in settings.items()
-        ])
+            _settings[_key] = _val
+        content['settings'] = _settings

tests/test_kobo_locking.py

@@ -9,7 +9,7 @@
 from formpack.constants import KOBO_LOCK_SHEET
 from formpack.utils.kobo_locking import (
     get_kobo_locking_profiles,
-    revert_kobo_lock_structre,
+    revert_kobo_lock_structure,
     strip_kobo_locking_profile,
 )
 from formpack.utils.exceptions import FormPackLibraryLockingError
@@ -126,7 +126,7 @@ def test_get_kobo_locking_profiles(self):
             ][0]
             assert expected_restrictions == actual_restrictions
 
-    def test_revert_kobo_lock_structre(self):
+    def test_revert_kobo_lock_structure(self):
         expected_reverted_locking_profiles = [
             {'restriction': 'choice_add', 'core': 'locked', 'flex': 'locked'},
             {'restriction': 'choice_delete', 'delete': 'locked'},
@@ -210,7 +210,7 @@ def test_revert_kobo_lock_structre(self):
         actual_reverted_locks = {
             KOBO_LOCK_SHEET: get_kobo_locking_profiles(xls)
         }
-        revert_kobo_lock_structre(actual_reverted_locks)
+        revert_kobo_lock_structure(actual_reverted_locks)
 
         def _get_sorted_restrictions(restrictions):
             return sorted(restrictions, key=lambda k: k['restriction'])