Merge pull request #1955 from rowillia/fix_python3_deprecation_warnings

Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.
This commit is contained in:
Bruno Oliveira 2016-09-22 17:37:52 -03:00 committed by GitHub
commit e5deb8a927
4 changed files with 10 additions and 1 deletions

View File

@ -12,6 +12,7 @@ if sys.version_info[0] >= 3:
else: else:
from ._py2traceback import format_exception_only from ._py2traceback import format_exception_only
class Code(object): class Code(object):
""" wrapper around Python code objects """ """ wrapper around Python code objects """
def __init__(self, rawcode): def __init__(self, rawcode):
@ -28,6 +29,8 @@ class Code(object):
def __eq__(self, other): def __eq__(self, other):
return self.raw == other.raw return self.raw == other.raw
__hash__ = None
def __ne__(self, other): def __ne__(self, other):
return not self == other return not self == other

View File

@ -52,6 +52,8 @@ class Source(object):
return str(self) == other return str(self) == other
return False return False
__hash__ = None
def __getitem__(self, key): def __getitem__(self, key):
if isinstance(key, int): if isinstance(key, int):
return self.lines[key] return self.lines[key]

View File

@ -105,7 +105,7 @@ except NameError:
def assertrepr_compare(config, op, left, right): def assertrepr_compare(config, op, left, right):
"""Return specialised explanations for some operators/operands""" """Return specialised explanations for some operators/operands"""
width = 80 - 15 - len(op) - 2 # 15 chars indentation, 1 space around op width = 80 - 15 - len(op) - 2 # 15 chars indentation, 1 space around op
left_repr = py.io.saferepr(left, maxsize=int(width/2)) left_repr = py.io.saferepr(left, maxsize=int(width//2))
right_repr = py.io.saferepr(right, maxsize=width-len(left_repr)) right_repr = py.io.saferepr(right, maxsize=width-len(left_repr))
summary = u('%s %s %s') % (ecu(left_repr), op, ecu(right_repr)) summary = u('%s %s %s') % (ecu(left_repr), op, ecu(right_repr))

View File

@ -1357,6 +1357,8 @@ class approx(object):
return False return False
return all(a == x for a, x in zip(actual, self.expected)) return all(a == x for a, x in zip(actual, self.expected))
__hash__ = None
def __ne__(self, actual): def __ne__(self, actual):
return not (actual == self) return not (actual == self)
@ -1436,6 +1438,8 @@ class ApproxNonIterable(object):
# Return true if the two numbers are within the tolerance. # Return true if the two numbers are within the tolerance.
return abs(self.expected - actual) <= self.tolerance return abs(self.expected - actual) <= self.tolerance
__hash__ = None
def __ne__(self, actual): def __ne__(self, actual):
return not (actual == self) return not (actual == self)