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
isaak yansane-sisk
slapos.buildout
Commits
08dd9385
Commit
08dd9385
authored
Jul 10, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix option comparison in case they are not in the same order
parent
02e0a757
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+8
-8
No files found.
src/zc/buildout/buildout.py
View file @
08dd9385
...
@@ -1605,15 +1605,15 @@ class Options(UserDict.DictMixin):
...
@@ -1605,15 +1605,15 @@ class Options(UserDict.DictMixin):
"""Because __cmp__ calls cmp(self, other)
"""Because __cmp__ calls cmp(self, other)
and if self contains set instance, it fails.
and if self contains set instance, it fails.
"""
"""
if
isinstance
(
other
,
(
UserDict
.
DictMixin
,
dict
)):
try
:
for
item_self
,
item_other
in
itertools
.
izip_longest
(
b
=
other
.
items
()
self
.
iteritems
(),
except
StandardError
:
other
.
iteritems
()):
if
item_self
!=
item_other
:
return
False
return
True
else
:
return
super
(
Options
,
self
).
__eq__
(
other
)
return
super
(
Options
,
self
).
__eq__
(
other
)
# BBB: Note such sorting would not work with python3
a
=
self
.
items
()
a
.
sort
()
b
.
sort
()
return
a
==
b
def
_convert_bool
(
name
,
value
):
def
_convert_bool
(
name
,
value
):
...
...
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