Skip to content

Commit

Permalink
Merge pull request #8 from danvk/py3travis
Browse files Browse the repository at this point in the history
Run tests under Python3 on Travis
  • Loading branch information
danvk committed Feb 26, 2015
2 parents 8c94edd + 14dd04f commit 2158f56
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: python
python:
- "2.7"
- "3.4"

script: nosetests
1 change: 0 additions & 1 deletion jsonselect/jsonselect.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
if PY3:
stringtype=str


def iteritems(d):
return d.items()

Expand Down
2 changes: 1 addition & 1 deletion tests/stop_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def test_abort():


def test_ignore_subtree():
obj=OrderedDict([('foo',[1,2,3]), ('bar', [4, 5, 6] ) ])
obj = OrderedDict([('foo', [1, 2, 3]), ('bar', [4, 5, 6] ) ])
out = []

def bail(obj, matches):
Expand Down

0 comments on commit 2158f56

Please sign in to comment.