Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.6
Changeset: r97810:99f01005c2c6
Date: 2019-10-18 16:38 +0300
http://bitbucket.org/pypy/pypy/changeset/99f01005c2c6/
Log: merge default into branch
diff --git a/lib_pypy/pyrepl/historical_reader.py
b/lib_pypy/pyrepl/historical_reader.py
--- a/lib_pypy/pyrepl/historical_reader.py
+++ b/lib_pypy/pyrepl/historical_reader.py
@@ -112,7 +112,7 @@
r.isearch_term = ''
r.dirty = 1
r.push_input_trans(r.isearch_trans)
-
+
class reverse_history_isearch(commands.Command):
def do(self):
@@ -218,7 +218,7 @@
self.isearch_trans = input.KeymapTranslator(
isearch_keymap, invalid_cls=isearch_end,
character_cls=isearch_add_character)
-
+
def select_item(self, i):
self.transient_history[self.historyi] = self.get_unicode()
buf = self.transient_history.get(i)
@@ -303,7 +303,7 @@
reader.ps1 = "h**> "
reader.ps2 = "h/*> "
reader.ps3 = "h|*> "
- reader.ps4 = "h\*> "
+ reader.ps4 = r"h\*> "
while reader.readline():
pass
diff --git a/lib_pypy/pyrepl/keymap.py b/lib_pypy/pyrepl/keymap.py
--- a/lib_pypy/pyrepl/keymap.py
+++ b/lib_pypy/pyrepl/keymap.py
@@ -58,7 +58,7 @@
"'":"'",
'"':'"',
'a':'\a',
- 'b':'\h',
+ 'b':'\b',
'e':'\033',
'f':'\f',
'n':'\n',
diff --git a/lib_pypy/pyrepl/reader.py b/lib_pypy/pyrepl/reader.py
--- a/lib_pypy/pyrepl/reader.py
+++ b/lib_pypy/pyrepl/reader.py
@@ -247,7 +247,7 @@
self.ps1 = "->> "
self.ps2 = "/>> "
self.ps3 = "|.. "
- self.ps4 = "\__ "
+ self.ps4 = r"\__ "
self.kill_ring = []
self.arg = None
self.finished = 0
diff --git a/pypy/doc/whatsnew-pypy3-5.10.0.rst
b/pypy/doc/whatsnew-pypy3-5.10.0.rst
deleted file mode 100644
--- a/pypy/doc/whatsnew-pypy3-5.10.0.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-========================
-What's new in PyPy3 7.0+
-========================
-
-.. this is the revision after release-pypy3.5-v7.0
-.. startrev: 9d2fa7c63b7c
-
diff --git a/pypy/doc/whatsnew-pypy3-6.0.0.rst
b/pypy/doc/whatsnew-pypy3-6.0.0.rst
deleted file mode 100644
--- a/pypy/doc/whatsnew-pypy3-6.0.0.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-========================
-What's new in PyPy3 7.0+
-========================
-
-.. this is the revision after release-pypy3.5-v7.0
-.. startrev: 9d2fa7c63b7c
-
diff --git a/pypy/doc/whatsnew-pypy3-7.1.0.rst
b/pypy/doc/whatsnew-pypy3-7.1.0.rst
deleted file mode 100644
--- a/pypy/doc/whatsnew-pypy3-7.1.0.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-========================
-What's new in PyPy3 7.0+
-========================
-
-.. this is the revision after release-pypy3.6-v7.0
-.. startrev: 33fe3b2cf186
-
-.. branch: py3.5
-
-Merge in py.35 and use this branch as the primary pypy3 one
-
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -1,58 +1,11 @@
========================
-What's new in PyPy3 7.1+
+What's new in PyPy3 7.2+
========================
-.. this is the revision after release-pypy3.6-v7.1.1
-.. startrev: db5a1e7fbbd0
+.. this is the revision after release-pypy3.6-v7.2
+.. startrev: 6d2f8470165b
-.. branch: fix-literal-prev_digit-underscore
-Fix parsing for converting strings with underscore into ints
+.. branch: py3.6-asyncgen
-.. branch: winmultiprocessing
-
-Improve multiprocessing support on win32
-
-.. branch: setitem2d
-
-Allow 2d indexing in ``memoryview.__setitem__`` (issue bb-3028)
-
-.. branch: py3.6-socket-fix
-.. branch: fix-importerror
-.. branch: dj_s390
-.. branch: bpo-35409
-.. branch: remove_array_with_char_test
-.. branch: fix_test_unicode_outofrange
-.. branch: Ram-Rachum/faulthandleris_enabled-should-return-fal-1563636614875
-.. branch:
Anthony-Sottile/fix-leak-of-file-descriptor-with-_iofile-1559687440863
-
-.. branch: py3tests
-
-Add handling of application-level test files and -D flag to test runner
-
-.. branch: vendor/stdlib-3.6
-.. branch: stdlib-3.6.9
-
-Update standard library to version 3.6.9
-
-.. branch: __debug__-optimize
-
-Fix handling of __debug__, sys.flags.optimize, and '-O' command-line flag to
-match CPython 3.6.
-
-.. branch: more-cpyext
-
-Add ``PyErr_SetFromWindowsErr`` and ``pytime.h``, ``pytime.c``. Fix order of
-fields in ``Py_buffer``.
-
-.. branch: Ryan-Hileman/add-support-for-zipfile-stdlib-1562420744699
-
-Add support for the entire stdlib being inside a zipfile
-
-
-.. branch: json-decoder-maps-py3.6
-
-Much faster and more memory-efficient JSON decoding. The resulting
-dictionaries that come out of the JSON decoder have faster lookups too.
-
-
+Fix asyncgen_hooks and refactor coroutine execution
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -643,6 +643,20 @@
def test_reload_infinite(self):
import infinite_reload
+ def test_reload_module_subclass(self):
+ import types
+
+ #MyModType = types.ModuleType
+ class MyModType(types.ModuleType):
+ pass
+
+ m = MyModType("abc")
+ with raises(ImportError):
+ # Fails because the module is not in sys.modules, but *not* because
+ # it's a subtype of ModuleType.
+ reload(m)
+
+
def test_explicitly_missing(self):
import sys
sys.modules['foobarbazmod'] = None
diff --git a/rpython/jit/backend/aarch64/opassembler.py
b/rpython/jit/backend/aarch64/opassembler.py
--- a/rpython/jit/backend/aarch64/opassembler.py
+++ b/rpython/jit/backend/aarch64/opassembler.py
@@ -808,9 +808,7 @@
# Inline a series of STR operations, starting at 'dstaddr_loc'.
#
self.mc.gen_load_int(r.ip0.value, 0)
- i = 0
- adjustment = 0
- needs_adjustment = itemsize < 8 and (startbyte % 8)
+ i = dst_i = 0
total_size = size_box.getint()
while i < total_size:
sz = itemsize
@@ -818,19 +816,19 @@
next_group += 8
if next_group <= total_size:
sz = 8
+ if dst_i % 8: # unaligned?
+ self.mc.ADD_ri(dstaddr_loc.value,
dstaddr_loc.value, dst_i)
+ dst_i = 0
if sz == 8:
- if needs_adjustment:
- self.mc.ADD_ri(dstaddr_loc.value, dstaddr_loc.value, i)
- adjustment = -i
- needs_adjustment = False
- self.mc.STR_ri(r.ip0.value, dstaddr_loc.value, i +
adjustment)
+ self.mc.STR_ri(r.ip0.value, dstaddr_loc.value, dst_i)
elif sz == 4:
- self.mc.STRW_ri(r.ip0.value, dstaddr_loc.value, i +
adjustment)
+ self.mc.STRW_ri(r.ip0.value, dstaddr_loc.value, dst_i)
elif sz == 2:
- self.mc.STRH_ri(r.ip0.value, dstaddr_loc.value, i +
adjustment)
+ self.mc.STRH_ri(r.ip0.value, dstaddr_loc.value, dst_i)
else:
- self.mc.STRB_ri(r.ip0.value, dstaddr_loc.value, i +
adjustment)
+ self.mc.STRB_ri(r.ip0.value, dstaddr_loc.value, dst_i)
i += sz
+ dst_i += sz
else:
if isinstance(size_box, ConstInt):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
