Use OrderedDict to retain deterministic ordering of version info in egg_info command. Remove lexicographic ordering in setopt.edit_config. Ref #553

1 files changed, 2 insertions, 5 deletions

diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 912da782..7f332be5 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -2,7 +2,6 @@ from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
 import distutils
-import operator
 import os
 
 from setuptools.extern.six.moves import configparser
@@ -43,8 +42,7 @@ def edit_config(filename, settings, dry_run=False):
     log.debug("Reading configuration from %s", filename)
     opts = configparser.RawConfigParser()
     opts.read([filename])
-    for section, options in sorted(settings.items(),
-                                   key=operator.itemgetter(0)):
+    for section, options in settings.items():
         if options is None:
             log.info("Deleting section [%s] from %s", section, filename)
             opts.remove_section(section)
@@ -52,8 +50,7 @@ def edit_config(filename, settings, dry_run=False):
             if not opts.has_section(section):
                 log.debug("Adding new section [%s] to %s", section, filename)
                 opts.add_section(section)
-            for option, value in sorted(options.items(),
-                                        key=operator.itemgetter(0)):
+            for option, value in options.items():
                 if value is None:
                     log.debug(
                         "Deleting %s.%s from %s",