[pypy-commit] pypy default: test, fix for win32.
mattip
pypy.commits at gmail.com
Tue Feb 26 10:46:22 EST 2019
Author: Matti Picus <matti.picus at gmail.com>
Branch:
Changeset: r96172:25b25fdd6d5c
Date: 2019-02-26 11:18 +0200
http://bitbucket.org/pypy/pypy/changeset/25b25fdd6d5c/
Log: test, fix for win32.
The asserts should be py3.6 only, and theny point to unfinished utf8
changes
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -1190,6 +1190,11 @@
os = self.posix
with open(self.path, "w") as f:
f.write("this is a rename test")
+ str_name = str(self.pdir) + '/test_rename.txt'
+ os.rename(self.path, str_name)
+ with open(str_name) as f:
+ assert f.read() == 'this is a rename test'
+ os.rename(str_name, self.path)
unicode_name = str(self.udir) + u'/test\u03be.txt'
os.rename(self.path, unicode_name)
with open(unicode_name) as f:
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -1273,8 +1273,6 @@
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()
@@ -1285,8 +1283,6 @@
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