Merge pull request #220 from CenterForOpenScience/issue_220

jlward · web-flow · commit 6a5188845ad0 · 2016-07-29T13:30:06.000-07:00
`ValueError: invalid literal for int() with base 10:` crash calling `start_margin_position`
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+**0.9.10**
+
+- No longer error when processing margin positions with decimal points.
+
 **0.9.9**
 
 - Rect elements now correctly handle image data
diff --git a/pydocx/openxml/wordprocessing/paragraph_properties.py b/pydocx/openxml/wordprocessing/paragraph_properties.py
@@ -35,11 +35,11 @@ def start_margin_position(self):
         # ignored.
         start_margin = 0
         if self.indentation_left:
-            start_margin += int(self.indentation_left)
+            start_margin += int(float(self.indentation_left))
         if self.indentation_hanging:
-            start_margin -= int(self.indentation_hanging)
+            start_margin -= int(float(self.indentation_hanging))
         elif self.indentation_first_line:
-            start_margin += int(self.indentation_first_line)
+            start_margin += int(float(self.indentation_first_line))
         if start_margin:
             return start_margin
         return 0
diff --git a/tests/openxml/wordprocessing/test_paragraph_properties.py b/tests/openxml/wordprocessing/test_paragraph_properties.py
@@ -105,3 +105,21 @@ def test_returns_left_minus_hanging_ignoring_first_line(self):
         '''
         properties = self._load_from_xml(xml)
         self.assertEqual(properties.start_margin_position, 100)
+
+    def test_allow_decimal_indentation_for_hanging(self):
+        xml = '''
+            <pPr>
+                <ind left="123.1" hanging="23.2" />
+            </pPr>
+        '''
+        properties = self._load_from_xml(xml)
+        self.assertEqual(properties.start_margin_position, 100)
+
+    def test_allow_decimal_indentation_for_first_line(self):
+        xml = '''
+            <pPr>
+                <ind left="123.3" firstLine="50.4" />
+            </pPr>
+        '''
+        properties = self._load_from_xml(xml)
+        self.assertEqual(properties.start_margin_position, 173)
