input: Allow xml ids to be attributes

Author: Bjwebb

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Don't fail if compiled translation files (.mo) don't exist, and Django isn't installed
 - Fix some incorrect assumptions about types
+- Allow XML IDs to be attributes
 
 ## [0.15.1] - 2020-10-21
 

flattentool/input.py

@@ -413,17 +413,19 @@ def do_unflatten(self):
                     )
 
                 def inthere(unflattened, id_name):
-                    if self.xml:
+                    if self.xml and not isinstance(unflattened.get(self.id_name), Cell):
+                        # For an XML tag
                         return unflattened[id_name]["text()"].cell_value
                     else:
+                        # For a JSON, or an XML attribute
                         return unflattened[id_name].cell_value
 
                 if (
                     self.id_name in unflattened
                     and inthere(unflattened, self.id_name)
                     in main_sheet_by_ocid[root_id_or_none]
                 ):
-                    if self.xml:
+                    if self.xml and not isinstance(unflattened.get(self.id_name), Cell):
                         unflattened_id = unflattened.get(self.id_name)[
                             "text()"
                         ].cell_value
@@ -1120,7 +1122,11 @@ def __repr__(self):
     def append(self, item):
         if self.keyfield in item:
             if self.xml:
-                if isinstance(item[self.keyfield]["text()"], Cell):
+                if isinstance(item[self.keyfield], Cell):
+                    # For an XML attribute
+                    key = item[self.keyfield].cell_value
+                elif isinstance(item[self.keyfield]["text()"], Cell):
+                    # For an XML tag
                     key = item[self.keyfield]["text()"].cell_value
                 else:
                     key = item[self.keyfield]["text()"]