To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit aa6e7d2c authored by Philip Jenvey's avatar Philip Jenvey
Browse files

merge py3k

parents ec3e9dff 93b2ac42
......@@ -8,3 +8,28 @@ What's new in PyPy3 2.4+
.. branch: py3k-memoryview
Implement new memoryview features.
.. branch: py3.3
.. branch: py3.3-hashfix
Use intobject hash function for specialisedtuple
.. branch: follow_symlinks
Add support for dir_fd and follow_symlinks in posix.stat()
.. branch: stat_ns
Implement the st_xtime_ns fields in stat_result()
.. branch: 33_fix_itertools
Add pickling support for the itertools classes
.. branch: py3k-update
.. branch: py3k-get_clock_info
.. branch: py3k-update
......@@ -67,10 +67,11 @@ def fsdecode(space, w_string):
uni = runicode.str_decode_utf_8(
bytes, len(bytes), 'surrogateescape',
errorhandler=state.decode_error_handler)[0]
elif state.codec_need_encodings:
# bootstrap check: if the filesystem codec is implemented in
# Python we cannot use it before the codecs are ready. use the
# locale codec instead
elif space.sys.filesystemencoding is None or state.codec_need_encodings:
# bootstrap check: if the filesystemencoding isn't initialized
# or the filesystem codec is implemented in Python we cannot
# use it before the codecs are ready. use the locale codec
# instead
from pypy.module._codecs.locale import (
str_decode_locale_surrogateescape)
bytes = space.bytes_w(w_string)
......@@ -95,10 +96,11 @@ def fsencode(space, w_uni):
bytes = runicode.unicode_encode_utf_8(
uni, len(uni), 'surrogateescape',
errorhandler=state.encode_error_handler)
elif state.codec_need_encodings:
# bootstrap check: if the filesystem codec is implemented in
# Python we cannot use it before the codecs are ready. use the
# locale codec instead
elif space.sys.filesystemencoding is None or state.codec_need_encodings:
# bootstrap check: if the filesystemencoding isn't initialized
# or the filesystem codec is implemented in Python we cannot
# use it before the codecs are ready. use the locale codec
# instead
from pypy.module._codecs.locale import (
unicode_encode_locale_surrogateescape)
uni = space.unicode_w(w_uni)
......
......@@ -587,9 +587,9 @@ class AppTestMinMax:
raises(TypeError, min, 1, 2, key=lambda x: x, bar=2)
assert type(min(1, 1.0)) is int
assert type(min(1.0, 1)) is float
assert type(min(1, 1.0, 1L)) is int
assert type(min(1.0, 1L, 1)) is float
assert type(min(1L, 1, 1.0)) is long
assert type(min(1, 1.0, 1)) is int
assert type(min(1.0, 1, 1)) is float
assert type(min(1, 1, 1.0)) is int
def test_max(self):
assert max(1, 2) == 2
......@@ -599,6 +599,6 @@ class AppTestMinMax:
raises(TypeError, max, 1, 2, key=lambda x: x, bar=2)
assert type(max(1, 1.0)) is int
assert type(max(1.0, 1)) is float
assert type(max(1, 1.0, 1L)) is int
assert type(max(1.0, 1L, 1)) is float
assert type(max(1L, 1, 1.0)) is long
assert type(max(1, 1.0, 1)) is int
assert type(max(1.0, 1, 1)) is float
assert type(max(1, 1, 1.0)) is int
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment