[GR-14075] In virtual env the parameters are not given to graalpython correctly

PullRequest: graalpython/416

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py

@@ -0,0 +1,26 @@
+# Copyright (c) 2019, Oracle and/or its affiliates.
+# Copyright (C) 1996-2017 Python Software Foundation
+#
+# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+
+import unittest
+from itertools import *
+
+class CombinationsTests(unittest.TestCase):
+
+    def test_combinations_with_replacement(self):
+        cwr = combinations_with_replacement
+        self.assertRaises(TypeError, cwr, 'abc')       # missing r argument
+        self.assertRaises(TypeError, cwr, 'abc', 2, 1) # too many arguments
+        self.assertRaises(TypeError, cwr, None)        # pool is not iterable
+        self.assertRaises(ValueError, cwr, 'abc', -2)  # r is negative
+
+        result = list()
+        for a in cwr('ABC', 2):
+            result += a
+        correct = [('A','A'), ('A','B'), ('A','C'), ('B','B'), ('B','C'), ('C','C')]
+        compare = list();
+        for a in correct:
+            compare += a;
+        self.assertEqual(result,compare)
+

graalpython/lib-graalpython/itertools.py

@@ -523,7 +523,7 @@ class combinations():
 
     def __init__(self, pool, indices, r):
         self.pool = pool
-        self.indices = range(indices)
+        self.indices = indices
         if r < 0:
             raise ValueError("r must be non-negative")
         self.r = r
@@ -593,7 +593,7 @@ def __init__(self, iterable, r):
         if r < 0:
             raise ValueError("r must be non-negative")
         indices = [0] * r
-        combinations.__init__(pool, indices, r)
+        super().__init__(pool, indices, r)
         self.stopped = len(pool) == 0 and r > 0
 
     def get_maximum(self, i):

graalpython/lib-python/3/venv/__init__.py

@@ -135,7 +135,7 @@ def create_if_needed(d):
             if sys.platform == "win32":
                 f.write(" %*")
             else:
-                f.write(" $@")
+                f.write(" \"$@\"")
 
         if sys.platform != "win32":
             os.chmod(script, 0o777)

mx.graalpython/copyrights/overrides

@@ -233,6 +233,7 @@ graalpython/com.oracle.graal.python.test/src/tests/test_getattribute-bimorphic-i
 graalpython/com.oracle.graal.python.test/src/tests/test_getattribute-bimorphic-inobject.py,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_if-class-none.py,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_if.py,zippy.copyright
+graalpython/com.oracle.graal.python.test/src/tests/test_itertools.py,python.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_list.py,python.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_builtin.py,python.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_mandelbrot3.py,benchmarks.copyright