diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2009-07-03 22:07:35 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2009-07-03 22:07:35 -0400 |
| commit | 531ba0365f75a459dc28f997999c48dceb546a3e (patch) | |
| tree | 543bad64c843d35c35846ce913a9c5f66735422e | |
| parent | 230219b50f515b93adc9fc5c3aee5cc256876b0d (diff) | |
| download | python-coveragepy-git-531ba0365f75a459dc28f997999c48dceb546a3e.tar.gz | |
Clean up the `set` definitions for 2.3 (these should go someplace common).
| -rw-r--r-- | coverage/parser.py | 7 | ||||
| -rw-r--r-- | test/coveragetest.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/coverage/parser.py b/coverage/parser.py index e00687bf..73e0bd59 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -8,10 +8,11 @@ from coverage.misc import nice_pair, CoverageException # Python version compatibility try: - set() # new in 2.4 + set # new in 2.4 except NameError: - import sets - set = sets.Set # pylint: disable-msg=W0622 + # pylint: disable-msg=W0622 + # (Redefining built-in 'set') + from sets import Set as set class CodeParser: diff --git a/test/coveragetest.py b/test/coveragetest.py index dad96978..66bc8b62 100644 --- a/test/coveragetest.py +++ b/test/coveragetest.py @@ -3,8 +3,9 @@ import imp, os, random, shutil, sys, tempfile, textwrap, unittest from cStringIO import StringIO +# Python version compatibility try: - set() + set # new in 2.4 except NameError: # pylint: disable-msg=W0622 # (Redefining built-in 'set') |