Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r95659:cd77d2fb6cb8
Date: 2019-01-17 00:42 +0200
http://bitbucket.org/pypy/pypy/changeset/cd77d2fb6cb8/
Log: merge heads
diff --git a/extra_tests/test_bufferedreader.py
b/extra_tests/test_bufferedreader.py
--- a/extra_tests/test_bufferedreader.py
+++ b/extra_tests/test_bufferedreader.py
@@ -88,7 +88,7 @@
assert self.stream.readline(80) == expected
@pytest.mark.parametrize('StreamCls', [Stream, StreamCFFI])
-@settings(max_examples=50)
+@settings(max_examples=50, deadline=None)
@given(params=data_and_sizes(), chunk_size=st.integers(MIN_READ_SIZE, 8192))
def test_stateful(params, chunk_size, StreamCls):
data, sizes = params
diff --git a/extra_tests/test_datetime.py b/extra_tests/test_datetime.py
--- a/extra_tests/test_datetime.py
+++ b/extra_tests/test_datetime.py
@@ -33,7 +33,9 @@
(timedelta_safe(1, 2, 3), "timedelta_safe(1, 2, 3)"),
])
def test_repr(obj, expected):
- assert repr(obj) == expected
+ # XXX: there's a discrepancy between datetime.py and CPython's _datetime
+ # for the repr() of Python-defined subclasses of datetime classes.
+ assert repr(obj).endswith(expected)
@pytest.mark.parametrize("obj", [
datetime.date.today(),
diff --git a/lib_pypy/_ctypes/primitive.py b/lib_pypy/_ctypes/primitive.py
--- a/lib_pypy/_ctypes/primitive.py
+++ b/lib_pypy/_ctypes/primitive.py
@@ -410,6 +410,6 @@
id(self))
def __bool__(self):
- return self._buffer[0] not in (0, '\x00')
+ return self._buffer[0] not in (0, b'\x00')
from _ctypes.function import CFuncPtr
diff --git a/lib_pypy/_gdbm.py b/lib_pypy/_gdbm.py
--- a/lib_pypy/_gdbm.py
+++ b/lib_pypy/_gdbm.py
@@ -74,12 +74,11 @@
self.__check_closed()
key = _checkstr(key)
return lib.pygdbm_exists(self.__ll_dbm, key, len(key))
- has_key = __contains__
def get(self, key, default=None):
with _lock:
self.__check_closed()
- key = _checkstr(key)
+ key = _checkstr(key)
drec = lib.pygdbm_fetch(self.__ll_dbm, key, len(key))
if not drec.dptr:
return default
diff --git a/pypy/module/__pypy__/test/test_builders.py
b/pypy/module/__pypy__/test/test_builders.py
--- a/pypy/module/__pypy__/test/test_builders.py
+++ b/pypy/module/__pypy__/test/test_builders.py
@@ -4,33 +4,32 @@
def test_simple(self):
from __pypy__.builders import StringBuilder
b = StringBuilder()
- b.append("abc")
- b.append("123")
- b.append("1")
+ b.append(u"abc")
+ b.append(u"123")
+ b.append(u"1")
s = b.build()
- assert s == "abc1231"
- assert type(s) is unicode
+ assert s == u"abc1231"
assert b.build() == s
- b.append("123")
- assert b.build() == s + "123"
+ b.append(u"123")
+ assert b.build() == s + u"123"
def test_preallocate(self):
from __pypy__.builders import StringBuilder
b = StringBuilder(10)
- b.append("abc")
- b.append("123")
+ b.append(u"abc")
+ b.append(u"123")
s = b.build()
- assert s == "abc123"
+ assert s == u"abc123"
def test_append_slice(self):
from __pypy__.builders import StringBuilder
b = StringBuilder()
- b.append_slice("abcdefgh", 2, 5)
- raises(ValueError, b.append_slice, "1", 2, 1)
+ b.append_slice(u"abcdefgh", 2, 5)
+ raises(ValueError, b.append_slice, u"1", 2, 1)
s = b.build()
- assert s == "cde"
- b.append_slice("abc", 1, 2)
- assert b.build() == "cdeb"
+ assert s == u"cde"
+ b.append_slice(u"abc", 1, 2)
+ assert b.build() == u"cdeb"
def test_stringbuilder(self):
from __pypy__.builders import BytesBuilder
diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py
b/pypy/module/pypyjit/test_pypy_c/test_misc.py
--- a/pypy/module/pypyjit/test_pypy_c/test_misc.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_misc.py
@@ -191,8 +191,6 @@
assert log.result == 1000 * 999 / 2
loop, = log.loops_by_filename(self.filepath)
assert loop.match(self.RANGE_ITER_STEP_1)
- i94 = int_lt(0, i9)
- guard_true(i94, descr=...)
def test_chain_of_guards(self):
src = """
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
