Merge pull request #18 from miguelsousa/true-integer

Write plist floats as integers if they can be converted
unified-font-object · Dec 10, 2015 · b492423 · b492423
2 parents f87d5ea + d19be63
commit b492423
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/normalization/ufonormalizer.py b/normalization/ufonormalizer.py
@@ -2467,9 +2467,14 @@ def propertyListObject(self, data):
         >>> writer.getText() == u'<dict>\\n\\t<key>a</key>\\n\\t<string>b</string>\\n</dict>'
         True
 
+        >>> writer = XMLWriter(declaration=None)
+        >>> writer.propertyListObject({"a" : 20.2})
+        >>> writer.getText() == u'<dict>\\n\\t<key>a</key>\\n\\t<real>20.2</real>\\n</dict>'
+        True
+
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject({"a" : 20.0})
-        >>> writer.getText() == u'<dict>\\n\\t<key>a</key>\\n\\t<real>20</real>\\n</dict>'
+        >>> writer.getText() == u'<dict>\\n\\t<key>a</key>\\n\\t<integer>20</integer>\\n</dict>'
         True
 
         >>> writer = XMLWriter(declaration=None)
@@ -2533,28 +2538,28 @@ def propertyListObject(self, data):
         >>> writer.getText() == u'<real>-1.1</real>'
         True
 
+        Integer
+        -------
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject(1.0)
-        >>> writer.getText() == u'<real>1</real>'
+        >>> writer.getText() == u'<integer>1</integer>'
         True
 
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject(-1.0)
-        >>> writer.getText() == u'<real>-1</real>'
+        >>> writer.getText() == u'<integer>-1</integer>'
         True
 
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject(0.0)
-        >>> writer.getText() == u'<real>0</real>'
+        >>> writer.getText() == u'<integer>0</integer>'
         True
 
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject(-0.0)
-        >>> writer.getText() == u'<real>0</real>'
+        >>> writer.getText() == u'<integer>0</integer>'
         True
 
-        Integer
-        -------
         >>> writer = XMLWriter(declaration=None)
         >>> writer.propertyListObject(1)
         >>> writer.getText() == u'<integer>1</integer>'
@@ -2635,7 +2640,12 @@ def propertyListObject(self, data):
         elif isinstance(data, (int, long)):
             self._plistInt(data)
         elif isinstance(data, float):
-            self._plistFloat(data)
+        	dataStr = xmlConvertFloat(data)
+        	try:
+        		data = int(dataStr)
+        		self._plistInt(data)
+        	except ValueError:
+	            self._plistFloat(data)
         elif isinstance(data, plistlib.Data):
             self._plistData(data)
         elif isinstance(data, datetime.datetime):