Fix sorting.

83d8d941 · Tres Seaver · dc8b1c39 · 83d8d941 · 83d8d941
Commit 83d8d941 authored Jun 09, 2013 by Tres Seaver
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

src/zc/buildout/testing.py src/zc/buildout/testing.py +2 -4

src/zc/buildout/tests.py src/zc/buildout/tests.py +1 -1

No files found.
--- a/src/zc/buildout/testing.py
+++ b/src/zc/buildout/testing.py
@@ -61,8 +61,7 @@ def cat(dir, *names):
 def ls(dir, *subs):
    if subs:
        dir = os.path.join(dir, *subs)
-    names = os.listdir(dir)
+    names = sorted(os.listdir(dir))
-    names.sort()
    for name in names:
        if os.path.isdir(os.path.join(dir, name)):
            print_('d ', end=' ')
@@ -366,8 +365,7 @@ class Handler(BaseHTTPRequestHandler):
        self.send_response(200)
        if os.path.isdir(path):
            out = ['<html><body>\n']
-            names = os.listdir(path)
+            names = sorted(os.listdir(path))
-            names.sort()
            for name in names:
                if os.path.isdir(os.path.join(path, name)):
                    name += '/'

--- a/src/zc/buildout/tests.py
+++ b/src/zc/buildout/tests.py
@@ -816,8 +816,8 @@ On the other hand, if we have a regular egg, rather than a develop egg:
    -  zc.recipe.egg.egg-link
    >>> ls('eggs') # doctest: +ELLIPSIS
-    -  setuptools.eggpyN.N.egg
    -  foox-0.0.0-py2.4.egg
+    -  setuptools.eggpyN.N.egg
    ...
 We do not get a warning, but we do get setuptools included in the working set: