8000 Remove various Python 2.6 related workarounds by jenshnielsen · Pull Request #5373 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Remove various Python 2.6 related workarounds #5373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 5, 2015
Merged

Remove various Python 2.6 related workarounds #5373

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f39b388
Remove python2.6 backport in setupext
jenshnielsen Oct 31, 2015
aad5ad7
Remove 2.6 related workaround in cbook
jenshnielsen Oct 31, 2015
44cebb9
Remove python 2.6 workaround in labeled data test
jenshnielsen Oct 31, 2015
f33c490
Remove pre python2.6 workaround in multiprocess example
jenshnielsen Oct 31, 2015
020b08f
Correct supported versions in setupext
jenshnielsen Oct 31, 2015
a88fc21
Correct version check in __init__
jenshnielsen Oct 31, 2015
b8eb2d8
Remove 2.6 workaround for missing WeakSet
jenshnielsen Oct 31, 2015
dc7debc
Remove missing assert_less workaround from spines test
jenshnielsen Oct 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove python 2.6 workaround in labeled data test
  • Loading branch information
@jenshnielsen
jenshnielsen committed Oct 31, 2015
commit 44cebb9503b8445036af7a40697f1327398aaeef
15 changes: 4 additions & 11 deletions lib/matplotlib/tests/test_labeled_data_unpacking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@
# 3.2+ versions
from nose.tools import assert_regex, assert_not_regex
except ImportError:
try:
# 2.7 versions
from nose.tools import assert_regexp_matches, assert_not_regexp_matches
assert_regex = assert_regexp_matches
assert_not_regex = assert_not_regexp_matches
except ImportError:
# 2.6 versions
def noop(txt, regex):
raise SkipTest("No assert for regex matching in py2.6")
assert_regex = noop
assert_not_regex = noop
# 2.7 versions
from nose.tools import assert_regexp_matches, assert_not_regexp_matches
assert_regex = assert_regexp_matches
assert_not_regex = assert_not_regexp_matches

from ..testing import assert_produces_warning

Expand Down
0