# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2016-11-30 18:08:50 # Node ID bb35fe8621f557201adbac1f72d90ed17b0f4f22 # Parent 73ce055b169a0b764462eda5145845b68d15cff7 py3: use unicodes in __slots__ __slots__ in Python 3 accepts only unicodes and there is no harm using unicodes in __slots__. So just adding u'' is fine. Previous occurences of this problem are treated the same way. diff --git a/mercurial/statprof.py b/mercurial/statprof.py --- a/mercurial/statprof.py +++ b/mercurial/statprof.py @@ -177,7 +177,7 @@ state = ProfileState() class CodeSite(object): cache = {} - __slots__ = ('path', 'lineno', 'function', 'source') + __slots__ = (u'path', u'lineno', u'function', u'source') def __init__(self, path, lineno, function): self.path = path @@ -232,7 +232,7 @@ class CodeSite(object): return os.path.basename(self.path) class Sample(object): - __slots__ = ('stack', 'time') + __slots__ = (u'stack', u'time') def __init__(self, stack, time): self.stack = stack diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -36,7 +36,6 @@ mercurial/cffi/mpatch.py: error importing: No module named 'mercurial.cffi' (error at check-py3-compat.py:*) mercurial/cffi/osutil.py: error importing: No module named 'mercurial.cffi' (error at check-py3-compat.py:*) mercurial/scmwindows.py: error importing: No module named 'msvcrt' (error at win32.py:*) - mercurial/statprof.py: error importing: __slots__ items must be strings, not 'bytes' (error at statprof.py:*) mercurial/win32.py: error importing: No module named 'msvcrt' (error at win32.py:*) mercurial/windows.py: error importing: No module named 'msvcrt' (error at windows.py:*)