Merge branch 'master' of https://github.com/LettError/designSpaceDocument

# Conflicts:
#	Lib/designSpaceDocument/__init__.py

.gitignore

@@ -1,2 +1,6 @@
 test.designspace
 Lib/DesignSpaceDocument.egg-info
+.cache
+__pycache__
+*.py[co]
+.DS_Store

Lib/designSpaceDocument/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function, unicode_literals
 import os
 import xml.etree.ElementTree as ET
 
@@ -19,13 +20,16 @@ __all__ = [
     'SourceDescriptor', 'InstanceDescriptor',
     'AxisDescriptor', 'BaseDocReader', 'BaseDocWriter']
 
+
 class DesignSpaceDocumentError(Exception):
     def __init__(self, msg, obj=None):
         self.msg = msg
         self.obj = obj
+
     def __str__(self):
         return repr(self.msg) + repr(self.obj)
 
+
 def _indent(elem, whitespace="    ", level=0):
     # taken from http://effbot.org/zone/element-lib.htm#prettyprint
     i = "\n" + level * whitespace
@@ -42,16 +46,17 @@ def _indent(elem, whitespace="    ", level=0):
         if level and (not elem.tail or not elem.tail.strip()):
             elem.tail = i
 
+
 class SimpleDescriptor(object):
     """ Containers for a bunch of attributes"""
     def compare(self, other):
         # test if this object contains the same data as the other
         for attr in self._attrs:
             try:
-                #print getattr(self, attr), getattr(other, attr)
                 assert(getattr(self, attr) == getattr(other, attr))
             except AssertionError:
-                print "failed attribute", attr, getattr(self, attr), "!=", getattr(other, attr)
+                print("failed attribute", attr, getattr(self, attr), "!=", getattr(other, attr))
+
 
 class SourceDescriptor(SimpleDescriptor):
     """Simple container for data related to the source"""
@@ -62,6 +67,7 @@ class SourceDescriptor(SimpleDescriptor):
               'muteKerning', 'muteInfo',
               'mutedGlyphNames',
               'familyName', 'styleName']
+
     def __init__(self):
         self.path = None
         self.name = None
@@ -86,6 +92,7 @@ class InstanceDescriptor(SimpleDescriptor):
               'styleMapFamilyName',
               'styleMapStyleName',
               'kerning', 'info']
+
     def __init__(self):
         self.path = None
         self.name = None
@@ -104,6 +111,7 @@ class AxisDescriptor(SimpleDescriptor):
     """Simple container for the axis data"""
     flavor = "axis"
     _attrs = ['tag', 'name', 'maximum', 'minimum', 'default', 'map']
+
     def __init__(self):
         self.tag = None       # opentype tag for this axis
         self.name = None      # name of the axis used in locations
@@ -114,7 +122,7 @@ class AxisDescriptor(SimpleDescriptor):
         self.map = []
 
     def serialize(self):
-        # output to a dict
+        # output to a dict, used in testing
         d = dict(tag = self.tag,
                 name = self.name,
                 labelNames = self.labelNames,
@@ -131,6 +139,7 @@ class BaseDocWriter(object):
     axisDescriptorClass = AxisDescriptor
     sourceDescriptorClass = SourceDescriptor
     instanceDescriptorClass = InstanceDescriptor
+
     def __init__(self, documentPath, documentObject):
         self.path = documentPath
         self.documentObject = documentObject
@@ -158,7 +167,7 @@ class BaseDocWriter(object):
         if pretty:
             _indent(self.root, whitespace=self._whiteSpace)
         tree = ET.ElementTree(self.root)
-        tree.write(self.path, encoding=u"utf-8", method='xml', xml_declaration=True)
+        tree.write(self.path, encoding="utf-8", method='xml', xml_declaration=True)
 
     def _makeLocationElement(self, locationObject, name=None):
         """ Convert Location dict to a locationElement."""
@@ -319,10 +328,12 @@ class BaseDocWriter(object):
             glyphElement.append(mastersElement)
         return glyphElement
 
+
 class BaseDocReader(object):
     axisDescriptorClass = AxisDescriptor
     sourceDescriptorClass = SourceDescriptor
     instanceDescriptorClass = InstanceDescriptor
+
     def __init__(self, documentPath, documentObject):
         self.path = documentPath
         self.documentObject = documentObject
@@ -620,14 +631,10 @@ class DesignSpaceDocument(object):
         return loc
 
 
-
-
-
-
 if __name__ == "__main__":
 
     def test():
-        u"""
+        """
         >>> import os
         >>> testDocPath = os.path.join(os.getcwd(), "test.designspace")
         >>> masterPath1 = os.path.join(os.getcwd(), "masters", "masterTest1.ufo")
@@ -753,5 +760,4 @@ if __name__ == "__main__":
     def _test():
         import doctest
         doctest.testmod()
-    
     _test()