[py-svn] r37058 - in py/dist/py/apigen/tracer: . testing

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Jan 20 13:18:23 2007
New Revision: 37058

Modified:
   py/dist/py/apigen/tracer/description.py
   py/dist/py/apigen/tracer/model.py
   py/dist/py/apigen/tracer/testing/test_docgen.py
Log:
use py.builtin.set instead of the import


Modified: py/dist/py/apigen/tracer/description.py
==============================================================================
--- py/dist/py/apigen/tracer/description.py	(original)
+++ py/dist/py/apigen/tracer/description.py	Sat Jan 20 13:18:23 2007
@@ -8,11 +8,7 @@
 
 MAX_CALL_SITES = 20
 
-try:
-    set
-except NameError:
-    from sets import Set as set
-
+set = py.builtin.set
 
 def is_private(name):
     return name.startswith('_') and not name.startswith('__')

Modified: py/dist/py/apigen/tracer/model.py
==============================================================================
--- py/dist/py/apigen/tracer/model.py	(original)
+++ py/dist/py/apigen/tracer/model.py	Sat Jan 20 13:18:23 2007
@@ -5,12 +5,10 @@
 # we implement all the types which are in the types.*, naming
 # scheme after pypy's
 
+import py
 import types
 
-try:
-    set
-except NameError:
-    from sets import Set as set
+set = py.builtin.set
 
 
 # __extend__ and pairtype?

Modified: py/dist/py/apigen/tracer/testing/test_docgen.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_docgen.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_docgen.py	Sat Jan 20 13:18:23 2007
@@ -21,12 +21,9 @@
 #    sys.path.insert(0, str(data_path))
 
 # XXX: Perma doc storage disabled a bit
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 sorted = py.builtin.sorted
+set = py.builtin.set
 
 def fun(a, b, c):
     "Some docstring"