[pypy-svn] r75353 - in pypy/release/1.3.x/pypy/objspace/std: . test

[fijal at codespeak.net]

Author: fijal
Date: Sun Jun 13 00:12:56 2010
New Revision: 75353

Modified:
   pypy/release/1.3.x/pypy/objspace/std/dictmultiobject.py
   pypy/release/1.3.x/pypy/objspace/std/dicttype.py
   pypy/release/1.3.x/pypy/objspace/std/frame.py
   pypy/release/1.3.x/pypy/objspace/std/settype.py
   pypy/release/1.3.x/pypy/objspace/std/stringobject.py
   pypy/release/1.3.x/pypy/objspace/std/test/test_strutil.py
   pypy/release/1.3.x/pypy/objspace/std/test/test_tupleobject.py
   pypy/release/1.3.x/pypy/objspace/std/test/test_typeobject.py
   pypy/release/1.3.x/pypy/objspace/std/test/test_unicodeobject.py
   pypy/release/1.3.x/pypy/objspace/std/transparent.py
Log:
Missing part of the previous checkin


Modified: pypy/release/1.3.x/pypy/objspace/std/dictmultiobject.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/dictmultiobject.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/dictmultiobject.py	Sun Jun 13 00:12:56 2010
@@ -467,7 +467,7 @@
 
 
 # XXX fix this thing
-import time, py
+import time
 
 class DictInfo(object):
     _dict_infos = []

Modified: pypy/release/1.3.x/pypy/objspace/std/dicttype.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/dicttype.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/dicttype.py	Sun Jun 13 00:12:56 2010
@@ -4,7 +4,6 @@
 from pypy.interpreter import gateway
 from pypy.objspace.std.stdtypedef import StdTypeDef, SMM, no_hash_descr
 from pypy.objspace.std.register_all import register_all
-from pypy.interpreter.error import OperationError
 
 dict_copy       = SMM('copy',          1,
                       doc='D.copy() -> a shallow copy of D')

Modified: pypy/release/1.3.x/pypy/objspace/std/frame.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/frame.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/frame.py	Sun Jun 13 00:12:56 2010
@@ -130,7 +130,7 @@
                 w_result = getattr(f, attr)(w_1, w_2)
                 break
         else:
-            raise pyopcde.BytecodeCorruption, "bad COMPARE_OP oparg"
+            raise pyopcode.BytecodeCorruption, "bad COMPARE_OP oparg"
     f.pushvalue(w_result)
 
 
@@ -154,6 +154,7 @@
     if space.config.objspace.std.optimized_comparison_op:
         StdObjSpaceFrame.COMPARE_OP = fast_COMPARE_OP
     if space.config.objspace.std.logspaceoptypes:
+        assert 0, "logspaceoptypes: a few fixes a missing here"
         StdObjSpace._space_op_types = []
         for name, new in get_logging():
             setattr(StdObjSpaceFrame, name, new)

Modified: pypy/release/1.3.x/pypy/objspace/std/settype.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/settype.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/settype.py	Sun Jun 13 00:12:56 2010
@@ -2,7 +2,6 @@
 from pypy.interpreter import gateway
 from pypy.objspace.std.register_all import register_all
 from pypy.objspace.std.stdtypedef import StdTypeDef, no_hash_descr, SMM
-from pypy.interpreter import gateway
 
 set_add                         = SMM('add', 2,
                                       doc='Add an element to a set.\n\nThis'

Modified: pypy/release/1.3.x/pypy/objspace/std/stringobject.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/stringobject.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/stringobject.py	Sun Jun 13 00:12:56 2010
@@ -964,7 +964,6 @@
     return mod_format(space, w_format, w_values, do_unicode=False)
 
 def buffer__String(space, w_string):
-    from pypy.interpreter.buffer import StringBuffer
     return space.wrap(StringBuffer(w_string._value))
 
 # register all methods

Modified: pypy/release/1.3.x/pypy/objspace/std/test/test_strutil.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/test/test_strutil.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/test/test_strutil.py	Sun Jun 13 00:12:56 2010
@@ -2,8 +2,6 @@
 from pypy.objspace.std.strutil import *
 from pypy.interpreter.error import OperationError
 
-import py
-
 
 class TestStrUtil:
 

Modified: pypy/release/1.3.x/pypy/objspace/std/test/test_tupleobject.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/test/test_tupleobject.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/test/test_tupleobject.py	Sun Jun 13 00:12:56 2010
@@ -289,7 +289,7 @@
         assert (t * 1) is not t
         assert (t * 1) == t
 
-    def test_getslice(self):
+    def test_getslice_2(self):
         assert (5,2,3)[1:2] == (2,)
 
     def test_eq(self):

Modified: pypy/release/1.3.x/pypy/objspace/std/test/test_typeobject.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/test/test_typeobject.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/test/test_typeobject.py	Sun Jun 13 00:12:56 2010
@@ -1001,12 +1001,12 @@
         y.x = 3
         assert y.x == 3
 
-        def ga(self, name):
-            return 'GA'
+        def ga2(self, name):
+            return 'GA2'
 
-        X.__getattribute__ = ga
+        X.__getattribute__ = ga2
 
-        assert y.x == 'GA'
+        assert y.x == 'GA2'
 
 class TestNewShortcut:
 

Modified: pypy/release/1.3.x/pypy/objspace/std/test/test_unicodeobject.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/test/test_unicodeobject.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/test/test_unicodeobject.py	Sun Jun 13 00:12:56 2010
@@ -321,7 +321,7 @@
         assert U(u'test') == u'test'
         assert U(u'test').__class__ is U
 
-    def test_call_unicode(self):
+    def test_call_unicode_2(self):
         class X(object):
             def __unicode__(self):
                 return u'x'

Modified: pypy/release/1.3.x/pypy/objspace/std/transparent.py
==============================================================================
--- pypy/release/1.3.x/pypy/objspace/std/transparent.py	(original)
+++ pypy/release/1.3.x/pypy/objspace/std/transparent.py	Sun Jun 13 00:12:56 2010
@@ -3,7 +3,6 @@
 """
 
 from pypy.interpreter import gateway
-from pypy.interpreter.function import Function
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.objspace.std.proxyobject import *
 from pypy.objspace.std.typeobject import W_TypeObject