Diff
Modified: trunk/Tools/ChangeLog (273314 => 273315)
--- trunk/Tools/ChangeLog 2021-02-23 17:50:31 UTC (rev 273314)
+++ trunk/Tools/ChangeLog 2021-02-23 17:54:24 UTC (rev 273315)
@@ -1,3 +1,18 @@
+2021-02-23 Jonathan Bedard <[email protected]>
+
+ show-identifier fails with error: ascii codec can't decode byte 0xc3 in position
+ https://bugs.webkit.org/show_bug.cgi?id=222313
+ <rdar://problem/74645910>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py:
+ (Contributor.__repr__): Always return unicode for Python 2.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py:
+ (TestContributor.test_unicode):
+
2021-02-23 Rob Buis <[email protected]>
aspect-ratio shows in computed style when disabled
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (273314 => 273315)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-02-23 17:50:31 UTC (rev 273314)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-02-23 17:54:24 UTC (rev 273315)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='0.10.0',
+ version='0.10.1',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (273314 => 273315)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-02-23 17:50:31 UTC (rev 273314)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-02-23 17:54:24 UTC (rev 273315)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 10, 0)
+version = Version(0, 10, 1)
AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py (273314 => 273315)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py 2021-02-23 17:50:31 UTC (rev 273314)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/contributor.py 2021-02-23 17:54:24 UTC (rev 273315)
@@ -145,10 +145,7 @@
return self.emails[0]
def __repr__(self):
- return '{} <{}>'.format(
- string_utils.encode(self.name, target_type=str),
- string_utils.encode(self.email, target_type=str),
- )
+ return u'{} <{}>'.format(self.name, self.email)
def __hash__(self):
return hash(self.name)
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py (273314 => 273315)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py 2021-02-23 17:50:31 UTC (rev 273314)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/contributor_unittest.py 2021-02-23 17:54:24 UTC (rev 273315)
@@ -23,7 +23,7 @@
import json
import unittest
-from webkitcorepy import string_utils, StringIO
+from webkitcorepy import string_utils, StringIO, unicode
from webkitscmpy import Contributor
@@ -127,8 +127,8 @@
def test_unicode(self):
self.assertEqual(
- str(Contributor(u'Michael Br\u00fcning', ['[email protected]'])),
- string_utils.encode(u'Michael Br\u00fcning <[email protected]>', target_type=str),
+ unicode(Contributor(u'Michael Br\u00fcning', ['[email protected]'])),
+ string_utils.encode(u'Michael Br\u00fcning <[email protected]>', target_type=unicode),
)
def test_json_encode(self):
