Commits

Brian Kearns committed a5aeb45 Merge

merge default

  • Participants
  • Parent commits 6bbf58e, 7656fc1
  • Branches py3k

Comments (0)

Files changed (2)

pypy/conftest.py

File contents unchanged.

pypy/interpreter/app_main.py

     except AttributeError:
         print('no translation information found', file=sys.stderr)
     else:
-        optitems = list(options.items())
-        optitems.sort()
+        optitems = sorted(options.items())
         current = []
         for key, value in optitems:
             group = key.split('.')