Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r71886:36b2ee07a173
Date: 2014-06-02 15:53 -0700
http://bitbucket.org/pypy/pypy/changeset/36b2ee07a173/
Log: adapt to py3
diff --git a/pypy/module/posix/app_startfile.py
b/pypy/module/posix/app_startfile.py
--- a/pypy/module/posix/app_startfile.py
+++ b/pypy/module/posix/app_startfile.py
@@ -25,18 +25,18 @@
#
if operation is None:
operation = w.NULL
- if isinstance(filepath, str):
- if isinstance(operation, unicode):
+ if isinstance(filepath, bytes):
+ if isinstance(operation, str):
operation = operation.encode("ascii")
rc = w.lib.ShellExecuteA(w.NULL, operation, filepath,
w.NULL, w.NULL, w.SW_SHOWNORMAL)
- elif isinstance(filepath, unicode):
- if isinstance(operation, str):
+ elif isinstance(filepath, str):
+ if isinstance(operation, bytes):
operation = operation.decode("ascii")
rc = w.lib.ShellExecuteW(w.NULL, operation, filepath,
w.NULL, w.NULL, w.SW_SHOWNORMAL)
else:
- raise TypeError("argument 1 must be str or unicode")
+ raise TypeError("argument 1 must be str or bytes")
rc = int(w.cast("uintptr_t", rc))
if rc <= 32:
code, msg = w.getwinerror()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
