Commits

Christian Tismer committed d4d34a4

all of test_ll_os works now (more than before is started win64 ;-)

  • Participants
  • Parent commits 82f5470
  • Branches win64_gborg

Comments (0)

Files changed (3)

File pypy/rpython/lltypesystem/llmemory.py

         return "<ItemOffset %r %r>" % (self.TYPE, self.repeat)
 
     def __mul__(self, other):
-        if not isinstance(other, int):
+        if not isinstance(other, (int, long)):
             return NotImplemented
         return ItemOffset(self.TYPE, self.repeat * other)
 

File pypy/rpython/lltypesystem/lltype.py

     __slots__ = ('items',)
 
     def __init__(self, TYPE, n, initialization=None, parent=None, parentindex=None):
-        if not isinstance(n, int):
+        if not isinstance(n, (int, long)):
             raise TypeError, "array length must be an int"
         if n < 0:
             raise ValueError, "negative array length"

File pypy/rpython/module/test/test_ll_os.py

         pwd = os.getcwd()
         import ctypes
         buf = ctypes.create_string_buffer(1000)
-        ctypes.windll.kernel32.GetEnvironmentVariableA('=%c:' % pwd[0], buf, 1000)
+        len = ctypes.windll.kernel32.GetEnvironmentVariableA('=%c:' % pwd[0], buf, 1000)
+        if (len == 0) and "WINGDB_PYTHON" in os.environ:
+            # the ctypes call seems not to work in the Wing debugger
+            return
         assert str(buf.value).lower() == pwd
         # ctypes returns the drive letter in uppercase, os.getcwd does not