trunk merge

Cython/Compiler/Nodes.py

@@ -2986,15 +2986,16 @@ class ForInStatNode(LoopNode, StatNode):
         else:
             step = args[2]
             if isinstance(step, ExprNodes.UnaryMinusNode) and isinstance(step.operand, ExprNodes.IntNode):
-                step = ExprNodes.IntNode(pos = step.pos, value=-int(step.operand.value))
+                step = ExprNodes.IntNode(pos = step.pos, value=str(-int(step.operand.value, 0)))
             if isinstance(step, ExprNodes.IntNode):
-                if step.value > 0:
+                step_value = int(step.value, 0)
+                if step_value > 0:
                     self.step = step
                     self.relation1 = '<='
                     self.relation2 = '<'
                     return True
-                elif step.value < 0:
-                    self.step = ExprNodes.IntNode(pos = step.pos, value=-int(step.value))
+                elif step_value < 0:
+                    self.step = ExprNodes.IntNode(pos = step.pos, value=str(-step_value))
                     self.relation1 = '>='
                     self.relation2 = '>'
                     return True

runtests.py

@@ -55,6 +55,12 @@ class TestBuilder(object):
         return suite
 
     def handle_directory(self, path, context):
+        workdir = os.path.join(self.workdir, context)
+        if not os.path.exists(workdir):
+            os.makedirs(workdir)
+        if workdir not in sys.path:
+            sys.path.insert(0, workdir)
+
         expect_errors = (context == 'errors')
         suite = unittest.TestSuite()
         filenames = os.listdir(path)
@@ -69,10 +75,10 @@ class TestBuilder(object):
                 continue
             if context in TEST_RUN_DIRS:
                 test = CythonRunTestCase(
-                    path, self.workdir, module, self.annotate)
+                    path, workdir, module, self.annotate)
             else:
                 test = CythonCompileTestCase(
-                    path, self.workdir, module, expect_errors, self.annotate)
+                    path, workdir, module, expect_errors, self.annotate)
             suite.addTest(test)
         return suite
 
@@ -242,9 +248,6 @@ if __name__ == '__main__':
     if not os.path.exists(WORKDIR):
         os.makedirs(WORKDIR)
 
-    if not sys.path or sys.path[0] != WORKDIR:
-        sys.path.insert(0, WORKDIR)
-
     if WITH_CYTHON:
         from Cython.Compiler.Version import version
         from Cython.Compiler.Main import \