Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.buildout
Commits
83d8d941
Commit
83d8d941
authored
Jun 09, 2013
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sorting.
parent
dc8b1c39
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
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.
src/zc/buildout/testing.py
View file @
83d8d941
...
@@ -61,8 +61,7 @@ def cat(dir, *names):
...
@@ -61,8 +61,7 @@ def cat(dir, *names):
def
ls
(
dir
,
*
subs
):
def
ls
(
dir
,
*
subs
):
if
subs
:
if
subs
:
dir
=
os
.
path
.
join
(
dir
,
*
subs
)
dir
=
os
.
path
.
join
(
dir
,
*
subs
)
names
=
os
.
listdir
(
dir
)
names
=
sorted
(
os
.
listdir
(
dir
))
names
.
sort
()
for
name
in
names
:
for
name
in
names
:
if
os
.
path
.
isdir
(
os
.
path
.
join
(
dir
,
name
)):
if
os
.
path
.
isdir
(
os
.
path
.
join
(
dir
,
name
)):
print_
(
'd '
,
end
=
' '
)
print_
(
'd '
,
end
=
' '
)
...
@@ -366,8 +365,7 @@ class Handler(BaseHTTPRequestHandler):
...
@@ -366,8 +365,7 @@ class Handler(BaseHTTPRequestHandler):
self
.
send_response
(
200
)
self
.
send_response
(
200
)
if
os
.
path
.
isdir
(
path
):
if
os
.
path
.
isdir
(
path
):
out
=
[
'<html><body>
\
n
'
]
out
=
[
'<html><body>
\
n
'
]
names
=
os
.
listdir
(
path
)
names
=
sorted
(
os
.
listdir
(
path
))
names
.
sort
()
for
name
in
names
:
for
name
in
names
:
if
os
.
path
.
isdir
(
os
.
path
.
join
(
path
,
name
)):
if
os
.
path
.
isdir
(
os
.
path
.
join
(
path
,
name
)):
name
+=
'/'
name
+=
'/'
...
...
src/zc/buildout/tests.py
View file @
83d8d941
...
@@ -816,8 +816,8 @@ On the other hand, if we have a regular egg, rather than a develop egg:
...
@@ -816,8 +816,8 @@ On the other hand, if we have a regular egg, rather than a develop egg:
- zc.recipe.egg.egg-link
- zc.recipe.egg.egg-link
>>> ls('eggs') # doctest: +ELLIPSIS
>>> ls('eggs') # doctest: +ELLIPSIS
- setuptools.eggpyN.N.egg
- foox-0.0.0-py2.4.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:
We do not get a warning, but we do get setuptools included in the working set:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment