Merged revisions 68529 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68529 | mark.dickinson | 2009-01-11 11:54:02 +0000 (Sun, 11 Jan 2009) | 2 lines

  Remove __long__ methods from UserString and from Demo/ classes.
........

diff --git a/Demo/classes/Complex.py b/Demo/classes/Complex.py
index b6c4b10e006f012470316898d7b369ad4916091c..64c56d46538aaf11e14f74635b09cebd01a74e4b 100755 (executable)
--- a/Demo/classes/Complex.py
+++ b/Demo/classes/Complex.py
@@ -39,7 +39,6 @@
 #
 # These conversions accept complex arguments only if their imaginary part is zero:
 # int(z)
-# long(z)
 # float(z)
 #
 # The following operators accept two complex numbers, or one complex number
@@ -147,11 +146,6 @@ class Complex:
             raise ValueError("can't convert Complex with nonzero im to int")
         return int(self.re)
 
-    def __long__(self):
-        if self.im:
-            raise ValueError("can't convert Complex with nonzero im to long")
-        return int(self.re)
-
     def __float__(self):
         if self.im:
             raise ValueError("can't convert Complex with nonzero im to float")

diff --git a/Demo/classes/bitvec.py b/Demo/classes/bitvec.py
index 9ee3ebf8cbe73f1d6b70a7942db6799f55fc064e..62b26ccf3f51e794aadd70319a9929d455ba7fb3 100755 (executable)
--- a/Demo/classes/bitvec.py
+++ b/Demo/classes/bitvec.py
@@ -315,9 +315,6 @@ class BitVec:
     def __int__(self):
         return int(self._data)
 
-    def __long__(self):
-        return int(self._data)
-
     def __float__(self):
         return float(self._data)
 

diff --git a/Lib/collections.py b/Lib/collections.py
index 458cbefdf6be943c1b2cffc90d8538dcb9196866..c3faa9a44dffce5ff38c72b2934d116d6195ddb9 100644 (file)
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -255,7 +255,6 @@ class UserString(Sequence):
     def __str__(self): return str(self.data)
     def __repr__(self): return repr(self.data)
     def __int__(self): return int(self.data)
-    def __long__(self): return int(self.data)
     def __float__(self): return float(self.data)
     def __complex__(self): return complex(self.data)
     def __hash__(self): return hash(self.data)