Merge pull request #1 from untitaker/master

Use ordereddict from PyPI for Python < 2.7

setup.py

@@ -1,7 +1,14 @@
 from distutils.core import setup
+from sys import version_info
 
 with open("README.md") as readmefile:
     readme = readmefile.read()
+
+dependencies = []
+
+if version_info < (2, 7):
+    dependencies.append('ordereddict')
+
 setup(name='toml',
       version='0.6.5',
       description="Python Library for Tom's Obvious, Minimal Language",
@@ -11,4 +18,5 @@
       py_modules=['toml'],
       license="License :: OSI Approved :: MIT License",
       long_description=readme,
+      requires=dependencies
 )

toml.py

@@ -1,8 +1,12 @@
 import datetime
-import collections
+
+try:
+    from collections import OrderedDict
+except ImportError:  # Python < 2.7
+    from ordereddict import OrderedDict
 
 def parse(s):
-    retval = collections.OrderedDict()
+    retval = OrderedDict()
     currentlevel = retval
     if isinstance(s, str):
         sl = list(s)
@@ -43,7 +47,7 @@ def parse(s):
                     if i == len(groups) - 1:
                         raise Exception("What? "+group+" already exists?"+str(currentlevel))
                 except KeyError:
-                    currentlevel[group] = collections.OrderedDict()
+                    currentlevel[group] = OrderedDict()
                 currentlevel = currentlevel[group]
         elif "=" in line:
             pair = line.split('=', 1)
@@ -108,7 +112,7 @@ def emit(o):
     addtoretval, sections = emit_sections(o)
     retval += addtoretval
     while sections != {}:
-        newsections = collections.OrderedDict()
+        newsections = OrderedDict()
         for section in sections:
             addtoretval, addtosections = emit_sections(sections[section])
             if addtoretval:
@@ -121,7 +125,7 @@ def emit(o):
 
 def emit_sections(o):
     retstr = ""
-    retdict = collections.OrderedDict()
+    retdict = OrderedDict()
     for section in o:
         if not isinstance(o[section], dict):
             retstr += section + " = " + str(emit_value(o[section])) + '\n'