Merge remote-tracking branch 'origin/master' into topic/GR-13107

Author: timfel

CHANGELOG.md

@@ -18,7 +18,12 @@ language runtime. The main focus is on user-observable behavior of the engine.
 * Improve performance of `os.scandir` and functions that build on it (such as `glob`)
 * More correct implementation of standard streams, including buffering
 * Properly support the `-m` switch to run modules
-* Support creating ZIP files through the standard `zipfile` module
+* Support the standard `zipfile` module
+* Add the built-in `_cvs` module
+* Add support for `__slots__`
+* Allow arbitrary callable objects in methods, not only functions
+* Report that we have a TTY console if we are launched on a Terminal through our launcher
+* Add the `ginstall` custom module to install known packages such as NumPy and setuptools
 
 ## Version 1.0.0 RC10
 

README.md

@@ -14,7 +14,27 @@ To try it, you can use the bundled releases from
 some examples of what you can do with it, check out the
 [reference](https://www.graalvm.org/docs/reference-manual/languages/python/).
 
-##### Extension modules
+### Installing packages
+
+At the moment not enough of the standard library is implemented to run the
+standard package installers for many packages. As a convenience, we provide a
+simple module to install packages that we know to be working (including
+potential patches required for those packages). Try the following to find out
+more:
+
+```
+graalpython -m ginstall --help
+```
+
+As a slightly more exciting example, try:
+
+```
+graalpython -m ginstall install numpy
+```
+
+If all goes well (you'll need to have `clang`, `llvm-link`, `llvm-extract`,
+`llvm-nm`, and `opt` in your `PATH` in addition to the normal NumPy build
+dependencies), you should be able to `import numpy` afterwards.
 
 Support for more extension modules is high priority for us. We are actively
 building out our support for the Python C API to make extensions such as NumPy,
@@ -34,3 +54,4 @@ Universal Permissive License v 1.0 as shown at
 implementation is in part derived from and contains additional code from 3rd
 parties, the copyrights and licensing of which is detailed in the
 [LICENSE](LICENSE) and [3rd_party_licenses.txt](3rd_party_licenses.txt) files.
+

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -37,6 +37,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import unittest
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -534,3 +535,89 @@ def test_strip_bytes():
     assert b'abc'.strip(b'ac') == b'b'
     assert b'abc'.lstrip(b'ac') == b'bc'
     assert b'abc'.rstrip(b'ac') == b'ab'
+
+class BaseTestSplit:
+    
+    def test_string_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').split, ' ')
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, ' ')
+
+    def test_int_error(self):
+        self.assertRaises(TypeError, self.type2test(b'a b').split, 32)
+        self.assertRaises(TypeError, self.type2test(b'a b').rsplit, 32)
+
+    def test_split_unicodewhitespace(self):
+        for b in (b'a\x1Cb', b'a\x1Db', b'a\x1Eb', b'a\x1Fb'):
+            b = self.type2test(b)
+            self.assertEqual(b.split(), [b])
+        b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
+        self.assertEqual(b.split(), [b'\x1c\x1d\x1e\x1f'])
+
+    def test_rsplit_unicodewhitespace(self):
+        b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
+        self.assertEqual(b.rsplit(), [b'\x1c\x1d\x1e\x1f'])
+
+    def test_memoryview(self):
+        self.assertEqual(self.type2test(b'a b').split(memoryview(b' ')), [b'a', b'b'])
+        self.assertEqual(self.type2test(b'c d').rsplit(memoryview(b' ')), [b'c', b'd'])
+
+    def test_split(self):
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(), [b'ahoj', b'jak', b'se', b'mas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(), [b'ahoj', b'jak', b'se', b'mas'])
+
+    def test_maxsplit(self):
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(maxsplit=1), [b'ahoj', b'jak\tse\nmas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(maxsplit=1), [b'ahoj jak\tse', b'mas'])
+
+    def test_maxsplit_zero(self):
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(maxsplit=0), [b'ahoj jak\tse\nmas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(maxsplit=0), [b'ahoj jak\tse\nmas'])
+
+    def test_maxsplit_negative(self):
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(maxsplit=-10), [b'ahoj', b'jak', b'se', b'mas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(maxsplit=-10), [b'ahoj', b'jak', b'se', b'mas'])
+
+    def test_separator(self):
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(b' '), [b'ahoj', b'jak\tse\nmas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(b' '), [b'ahoj', b'jak\tse\nmas'])
+
+    def test_empty(self):
+        self.assertEqual(self.type2test(b'').split(), [])
+        self.assertEqual(self.type2test(b'').rsplit(), [])
+
+    def test_empty_delim(self):
+        self.assertEqual(self.type2test(b'').split(b' '), [b''])
+        self.assertEqual(self.type2test(b'').rsplit(b' '), [b''])
+
+    def test_empty_separator(self):
+        self.assertRaises(ValueError, self.type2test(b'a b').split, b'')
+        self.assertRaises(ValueError, self.type2test(b'a b').rsplit, b'')
+
+    def test_indexable_object(self):
+
+        class MyIndexable(object):
+            def __init__(self, value):
+                self.value = value
+            def __index__(self):
+                return self.value
+        
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(maxsplit=MyIndexable(1)), [b'ahoj', b'jak\tse\nmas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(maxsplit=MyIndexable(1)), [b'ahoj jak\tse', b'mas'])
+        
+class BytesSplitTest(BaseTestSplit, unittest.TestCase):
+    type2test = bytes
+
+class ByteArraySplitTest(BaseTestSplit, unittest.TestCase):
+    type2test = bytearray
+
+def test_add_mv_to_bytes():
+    b = b'hello '
+    mv = memoryview(b'world')
+    b += mv
+    assert b == b'hello world'
+
+def test_add_mv_to_bytearray():
+    ba = bytearray(b'hello ')
+    mv = memoryview(b'world')
+    ba += mv
+    assert ba == b'hello world'