diff options
| author | Martin Matusiak <numerodix@gmail.com> | 2014-03-07 22:10:36 +0100 |
|---|---|---|
| committer | Martin Matusiak <numerodix@gmail.com> | 2014-03-07 22:10:36 +0100 |
| commit | b00431436c2c1e70be2637f371ae4319e9ebd548 (patch) | |
| tree | 2b53479e52570bba805f366e17dd75d0f1bcd3bd | |
| parent | 144fa9193bd381af987b2670610c128484a6f59b (diff) | |
| parent | ae8e156421e85b36dfdad8a58d4627d0cf9103fb (diff) | |
| download | ansicolor-b00431436c2c1e70be2637f371ae4319e9ebd548.tar.gz | |
Merge branch 'release/0.0.2'0.0.2
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | ansicolor/__init__.py | 2 | ||||
| -rw-r--r-- | ansicolor/ansicolor.py | 9 | ||||
| -rw-r--r-- | dev-requirements.txt | 1 | ||||
| -rw-r--r-- | setup.py | 1 |
6 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,4 @@ +dist/ *.egg-info/ *.pyc .tox/ diff --git a/.travis.yml b/.travis.yml index a308783..aba0277 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - TOX_ENV=py27 - TOX_ENV=py32 - TOX_ENV=py33 - - TOX_ENV=pypyp + - TOX_ENV=pypy install: - pip install tox script: tox -e $TOX_ENV diff --git a/ansicolor/__init__.py b/ansicolor/__init__.py index 1f6428f..599286e 100644 --- a/ansicolor/__init__.py +++ b/ansicolor/__init__.py @@ -1,3 +1,3 @@ from ansicolor import * # noqa -__version__ = "0.0.1" +__version__ = "0.0.2" diff --git a/ansicolor/ansicolor.py b/ansicolor/ansicolor.py index 2dab6e1..a472fb3 100644 --- a/ansicolor/ansicolor.py +++ b/ansicolor/ansicolor.py @@ -131,7 +131,12 @@ def highlight_string(s, *spanlists, **kw): (begin,end),color,list_id = i markers.append( (begin, color, True, list_id) ) markers.append( (end, color, False, list_id) ) - markers.sort(key=lambda (pos,color,start_end,list_id): pos) + + def get_key(tup): + pos, color, start_end, list_id = tup + return pos + + markers.sort(key=get_key) # produce list of (pos, color, layer) pairs codes = [] @@ -204,7 +209,7 @@ def colordiff(x, y, color_x=Colors.Cyan, color_y=Colors.Green, debug=False): g = ((i,e) for (i,e) in enumerate(it)) def f(): try: - return g.next() + return next(g) except StopIteration: return (-1, None) return f diff --git a/dev-requirements.txt b/dev-requirements.txt index cc98422..3d9e8f0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,2 +1,3 @@ +cheesecake flake8 tox @@ -9,6 +9,7 @@ setup( description='A library to produce ansi color output and colored highlighting and diffing', author='Martin Matusiak', author_email='numerodix@gmail.com', + url='https://github.com/numerodix/ansicolor', packages=[ 'ansicolor', |