[pypy-commit] pypy default: some cleanups for the missing-ndarray-attributes merge

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r60912:5fe3bb565c81
Date: 2013-02-06 15:05 -0500
http://bitbucket.org/pypy/pypy/changeset/5fe3bb565c81/

Log:	some cleanups for the missing-ndarray-attributes merge

diff --git a/pypy/tool/watchdog_nt.py b/pypy/tool/watchdog_nt.py
deleted file mode 100644
--- a/pypy/tool/watchdog_nt.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import sys, os
-import threading
-import ctypes
-
-def childkill(pid):
-    global timedout
-    timedout = True
-    sys.stderr.write("==== test running for %d seconds ====\n" % timeout)
-    sys.stderr.write("="*26 + "timedout" + "="*26 + "\n")
-    ctypes.windll.kernel32.TerminateProcess(pid, 1)
-
-if __name__ == '__main__':
-    PROCESS_TERMINATE = 0x1
-
-    timeout = float(sys.argv[1])
-    timedout = False
-
-    pid = os.spawnv(os.P_NOWAIT, sys.argv[2], sys.argv[2:])
-
-    t = threading.Timer(timeout, childkill, (pid,))
-    t.start()
-    while True:
-        try:
-            pid, status = os.waitpid(pid, 0)
-        except KeyboardInterrupt:
-            continue
-        else:
-            t.cancel()
-            break
-
-    #print 'status ', status >> 8
-    sys.exit(status >> 8)
-
diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -447,9 +447,6 @@
             if (x is type(None) or      # add cases here if needed
                 x.__module__ == 'rpython.rtyper.lltypesystem.lltype'):
                 result = SomeType()
-            #elif x.__dict__.get('_mixin_', False):
-            #    raise Exception("Creating a PBC of a mixin class is "
-            #            "not RPython for class %r" % x)
             else:
                 result = SomePBC([self.getdesc(x)])
         elif callable(x):
diff --git a/rpython/rlib/test/test_rarithmetic.py b/rpython/rlib/test/test_rarithmetic.py
--- a/rpython/rlib/test/test_rarithmetic.py
+++ b/rpython/rlib/test/test_rarithmetic.py
@@ -1,5 +1,5 @@
 from rpython.rtyper.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
-from rpython.test.test_llinterp import interpret
+from rpython.rtyper.test.test_llinterp import interpret
 from rpython.rlib.rarithmetic import *
 import sys
 import py