Author: Matti Picus <matti.pi...@gmail.com>
Branch: unicode-utf8-py3
Changeset: r95994:2ae56b36c5ee
Date: 2019-02-13 00:51 +0200
http://bitbucket.org/pypy/pypy/changeset/2ae56b36c5ee/
Log: minimize rpython difference to unicode-utf8
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,8 +64,6 @@
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,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:
diff --git a/rpython/rlib/rutf8.py b/rpython/rlib/rutf8.py
--- a/rpython/rlib/rutf8.py
+++ b/rpython/rlib/rutf8.py
@@ -418,7 +418,6 @@
def has_surrogates(utf8):
# XXX write a faster version maybe
- # XXX does not check for trailing lone surrogates, needs tests
for ch in Utf8StringIterator(utf8):
if 0xD800 <= ch <= 0xDBFF:
return True
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
