[pypy-commit] pypy default: revert 6165ec8e5e76, broke translation on win32
mattip
pypy.commits at gmail.com
Wed Feb 20 13:03:35 EST 2019
Author: Matti Picus <matti.picus at gmail.com>
Branch:
Changeset: r96116:13b00df4c588
Date: 2019-02-20 19:51 +0200
http://bitbucket.org/pypy/pypy/changeset/13b00df4c588/
Log: revert 6165ec8e5e76, broke translation on win32
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:
More information about the pypy-commit
mailing list