[Pkg-bazaar-commits] ./bzr/unstable r961: - remove python2.3 set workarounds

[Martin Pool]

------------------------------------------------------------
revno: 961
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-22 19:31:40 -0300
message:
  - remove python2.3 set workarounds
modified:
  bzrlib/branch.py
  bzrlib/plugin.py
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2005-07-11 07:33:45 +0000
+++ b/bzrlib/branch.py	2005-07-22 22:31:40 +0000
@@ -361,7 +361,7 @@
             # ElementTree does its own conversion from UTF-8, so open in
             # binary.
             inv = unpack_xml(Inventory,
-                                  self.controlfile('inventory', 'rb'))
+                             self.controlfile('inventory', 'rb'))
             mutter("loaded inventory of %d items in %f"
                    % (len(inv), time() - before))
             return inv
@@ -806,10 +806,6 @@
         True
         """
         from bzrlib.progress import ProgressBar
-        try:
-            set
-        except NameError:
-            from sets import Set as set
 
         pb = ProgressBar()
 

=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py	2005-07-11 07:25:42 +0000
+++ b/bzrlib/plugin.py	2005-07-22 22:31:40 +0000
@@ -56,11 +56,7 @@
     _loaded = True
 
     import sys, os, imp
-    try:
-        set
-    except NameError:
-        from sets import Set as set         # python2.3
-
+    
     from bzrlib.trace import log_error, mutter, log_exception
     from bzrlib.errors import BzrError