Author: Brian Kearns <[email protected]>
Branch: 
Changeset: r70290:ba471437d878
Date: 2014-03-25 17:19 -0400
http://bitbucket.org/pypy/pypy/changeset/ba471437d878/

Log:    only apply this workaround for mbcs

diff --git a/lib-python/2.7/test/test_genericpath.py 
b/lib-python/2.7/test/test_genericpath.py
--- a/lib-python/2.7/test/test_genericpath.py
+++ b/lib-python/2.7/test/test_genericpath.py
@@ -232,9 +232,11 @@
         try:
             fsencoding = test_support.TESTFN_ENCODING or "ascii"
             asciival = unicwd.encode(fsencoding)
-            v = asciival.find('?')
-            if v >= 0:
-                raise UnicodeEncodeError(fsencoding, unicwd, v, v, asciival)
+            if fsencoding == "mbcs":
+                # http://bugs.python.org/issue850997
+                v = asciival.find('?')
+                if v >= 0:
+                    raise UnicodeEncodeError(fsencoding, unicwd, v, v, 
asciival)
         except (AttributeError, UnicodeEncodeError):
             # FS encoding is probably ASCII or windows and codepage is 
non-Latin1
             pass
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to