# HG changeset patch # User Mateusz Kwapich # Date 2016-10-10 12:30:14 # Node ID 85d5708eae4e316a28e8749cb4d4f4180cce062b # Parent 7be6101983606a1a9939f6067b4d1d17ce380750 py3: namedtuple takes unicode (journal ext) namedtuple usage consistent with changelog.py:141 diff --git a/hgext/journal.py b/hgext/journal.py --- a/hgext/journal.py +++ b/hgext/journal.py @@ -177,8 +177,8 @@ def unsharejournal(orig, ui, repo, repop return orig(ui, repo, repopath) class journalentry(collections.namedtuple( - 'journalentry', - 'timestamp user command namespace name oldhashes newhashes')): + u'journalentry', + u'timestamp user command namespace name oldhashes newhashes')): """Individual journal entry * timestamp: a mercurial (time, timezone) tuple 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 @@ -23,7 +23,6 @@ hgext/fsmonitor/pywatchman/capabilities.py: error importing: No module named 'pybser' (error at __init__.py:*) hgext/fsmonitor/pywatchman/pybser.py: error importing: No module named 'pybser' (error at __init__.py:*) hgext/fsmonitor/watchmanclient.py: error importing: No module named 'pybser' (error at __init__.py:*) - hgext/journal.py: error importing: Type names and field names must be valid identifiers: "b'journalentry'" (error at journal.py:*) hgext/largefiles/basestore.py: error importing: cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) hgext/largefiles/lfcommands.py: error importing: cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) hgext/largefiles/lfutil.py: error importing: cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*)