From 531ba0365f75a459dc28f997999c48dceb546a3e Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Fri, 3 Jul 2009 22:07:35 -0400
Subject: Clean up the `set` definitions for 2.3 (these should go someplace
 common).

---
 coverage/parser.py   | 7 ++++---
 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')
-- 
cgit v1.2.1