[Checkins] SVN: zope.configuration/branches/chrism-dictactions/src/zope/configuration/config.py make compatible with py3

Chris McDonough chrism at plope.com
Sat Dec 3 21:52:55 UTC 2011


Log message for revision 123564:
  make compatible with py3

Changed:
  U   zope.configuration/branches/chrism-dictactions/src/zope/configuration/config.py

-=-
Modified: zope.configuration/branches/chrism-dictactions/src/zope/configuration/config.py
===================================================================
--- zope.configuration/branches/chrism-dictactions/src/zope/configuration/config.py	2011-12-02 23:05:50 UTC (rev 123563)
+++ zope.configuration/branches/chrism-dictactions/src/zope/configuration/config.py	2011-12-03 21:52:54 UTC (rev 123564)
@@ -17,6 +17,7 @@
 """
 __docformat__ = 'restructuredtext'
 import __builtin__
+import operator
 import os.path
 import sys
 
@@ -1643,9 +1644,7 @@
         # We need to sort the actions by the paths so that the shortest
         # path with a given prefix comes first:
         def bypath(tup):
-            o, a = tup
-            return (a['includepath'], o, a['callable'], a['args'], a['kw'],
-                    a['info'])
+            return tup[1]['includepath'], tup[0]
         dups.sort(key=bypath)
         order, first = dups[0]
         output.append(dups[0])
@@ -1664,7 +1663,7 @@
     if conflicts:
         raise ConfigurationConflictError(conflicts)
 
-    output.sort()
+    output.sort(key=operator.itemgetter(0))
     return [ x[1] for x in output ]
 
 class ConfigurationConflictError(ConfigurationError):



More information about the checkins mailing list