[pypy-commit] pypy py3.6: merge default into branch

[mattip]

Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.6
Changeset: r96117:199b7e88fe60
Date: 2019-02-20 19:53 +0200
http://bitbucket.org/pypy/pypy/changeset/199b7e88fe60/

Log:    merge default into branch

diff --git a/rpython/rlib/_os_support.py b/rpython/rlib/_os_support.py
--- a/rpython/rlib/_os_support.py
+++ b/rpython/rlib/_os_support.py
@@ -64,6 +64,8 @@
         assert path is not None
         if isinstance(path, unicode):
             return path
+        elif isinstance(path, str):
+            raise RuntimeError('str given where unicode expected')
         else:
             return path.as_unicode()
 
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -1273,6 +1273,8 @@
         win32traits = make_win32_traits(traits)
         path1 = traits.as_str0(path1)
         path2 = traits.as_str0(path2)
+        assert isinstance(path1, unicode)
+        assert isinstance(path2, unicode)
         if not win32traits.MoveFileEx(path1, path2, 0):
             raise rwin32.lastSavedWindowsError()
 
@@ -1283,6 +1285,8 @@
         win32traits = make_win32_traits(traits)
         path1 = traits.as_str0(path1)
         path2 = traits.as_str0(path2)
+        assert isinstance(path1, unicode)
+        assert isinstance(path2, unicode)
         ret = win32traits.MoveFileEx(path1, path2,
                      win32traits.MOVEFILE_REPLACE_EXISTING)
         if not ret:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit