Skip to content

Commit a2e3980

Browse files
committed
patch over sorting differences
1 parent 0a9f4c4 commit a2e3980

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

jenkins.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
virtualenv venv
22
. venv/bin/activate
33
make develop
4-
export PYTEST_ADDOPTS="--junitxml=test-report.xml"
4+
export PYTEST_ADDOPTS="--junitxml=test-report.xml --junit-prefix=py2"
55
make $make_targets
66

77
virtualenv -p python3 venv3
88
. venv3/bin/activate
99
make python=python3 develop
10-
export PYTEST_ADDOPTS="--junitxml=test-report.xml"
10+
export PYTEST_ADDOPTS="--junitxml=test-report.xml --junit-prefix=py3"
1111
make python=python3 $make_targets

src/bd2k/util/expando.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class Expando(dict):
3232
3333
And since Expando is a dict, it serializes back to JSON just fine:
3434
35-
>>> json.dumps(o)
36-
'{"foo": 42, "bar": "hi"}'
35+
>>> json.dumps(o, sort_keys=True)
36+
'{"bar": "hi", "foo": 42}'
3737
3838
Attributes can be deleted, too:
3939
@@ -102,8 +102,8 @@ class MagicExpando(Expando):
102102
>>> o
103103
{'foo': 42}
104104
>>> o.bar.hello = 'hi'
105-
>>> o
106-
{'foo': 42, 'bar': {'hello': 'hi'}}
105+
>>> o.bar
106+
{'hello': 'hi'}
107107
"""
108108
def __getattribute__( self, name ):
109109
try:

0 commit comments

Comments
 (0)