PICARD-558: Initial port to Py3 #664

sambhav · 2017-03-25T15:30:16Z

https://tickets.metabrainz.org/browse/PICARD-588

zas · 2017-03-25T15:52:23Z

picard/ui/coverartbox.py

-        if url.scheme() in ('https', 'http'):
-            path = url.encodedPath()
+
+        if url.scheme() == 'http':


Previous code was url.scheme() in ('https', 'http'):, is this change intentionnal ?

zas · 2017-03-25T16:06:05Z

picard/ui/infodialog.py

@@ -297,7 +297,7 @@ def _display_info_tab(self):
        if album.errors:
            tabWidget.setTabText(tab_index, _("&Errors"))
            text = '<br />'.join(map(lambda s: '<font color="darkred">%s</font>' %
-                                     '<br />'.join(unicode(QtCore.Qt.escape(s))
+                                     '<br />'.join(str(cgi.escape(s))


https://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5 says Qt.escape() is deprecated in favor of QString.toHtmlEscaped(), cgi.escape() looks weird here, and it doesn't escape " by default.

There is also Py3 html.escape() https://docs.python.org/3/library/html.html
https://wiki.python.org/moin/EscapingHtml

Not sure which one is better.

QString.toHtmlEscaped() in doesn't work python it's a C only method. We can use html.escape however.

zas · 2017-04-02T18:58:41Z

picard/cluster.py

@@ -464,23 +464,23 @@ def cluster(self, threshold):
        # Keep the matches sorted in a heap
        heap = []

-        for y in xrange(self.clusterDict.getSize()):
-            for x in xrange(y):
+        for y in rane(self.clusterDict.getSize()):


rane() ??

zas · 2017-04-02T19:12:47Z

picard/metadata.py

@@ -267,7 +267,7 @@ def set(self, name, values):
    def __setitem__(self, name, values):
        if not isinstance(values, list):
            values = [values]
-        values = filter(None, map(unicode, values))
+        values = [value for value in map(str, values) if value is not None]


[str(value) for value in values if value is not None] ?

zas · 2017-04-02T19:16:23Z

picard/script.py

@@ -425,7 +426,8 @@ def func_unset(parser, name):
    # Allow wild-card unset for certain keys
    if name in ('performer:*', 'comment:*', 'lyrics:*'):
        name = name[:-1]
-        for key in parser.context.keys():
+        key_list = list(parser.context.keys())


for key in parser.context: ?

Can't do that since we are modifying parser.context in the loop. Storing it in an initial list just to be safe.

zas · 2017-04-03T10:57:31Z

Can't do that since we are modifying parser.context in the loop. Storing it in an initial list just to be safe.

I didn't read next lines... ;)

Freso

A couple of webbrowser2 specific comments.

Freso · 2017-04-05T10:32:47Z

picard/util/webbrowser2.py

-platform. Python 2.5 already has *some* support for this, but it's not
-enough, in my opinion. See also:
-http://sourceforge.net/tracker/index.php?func=detail&aid=1681228&group_id=5470&atid=105470
-"""


Please replace docstring instead of removing it. It's hard enough to get documentation into the codebase, so let's not remove what we have without at least putting new documentation in place.

Freso · 2017-04-05T10:34:31Z

picard/util/webbrowser2.py

@@ -23,65 +23,6 @@
 from PyQt5 import QtWidgets


I can't comment on code above this line. :( But I wanted to note that with the removed code, os and sys are no longer used, so they also no longer need to be imported here.

mineo

Currently crashes for me:

Traceback (most recent call last):
File "tagger.py", line 10, in
main(localedir, True)
File "./picard/tagger.py", line 766, in main
tagger = Tagger(picard_args, unparsed_args, localedir, autoupdate)
File "./picard/tagger.py", line 178, in init
setup_gettext(localedir, config.setting["ui_language"], log.debug)
File "./picard/i18n.py", line 76, in setup_gettext
_ugettext_countries = trans_countries.ugettext
AttributeError: 'GNUTranslations' object has no attribute 'ugettext'

mineo · 2017-04-05T17:59:15Z

picard/ui/options/interface.py

@@ -125,8 +125,8 @@ def __init__(self, parent=None):
        self.ui.setupUi(self)
        self.ui.ui_language.addItem(_('System default'), '')
        language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES]
-        for lang_code, native, translation in sorted(language_list, key=operator.itemgetter(2),


This makes the operator import unnecessary, afaict.

mineo · 2017-04-05T17:59:53Z

picard/ui/options/interface.py

-        for lang_code, native, translation in sorted(language_list, key=operator.itemgetter(2),
-                                                     cmp=locale.strcoll):
+        fcmp = lambda x: locale.strxfrm(x[2])
+        for lang_code, native, translation in sorted(language_list, key=fcmp):


To be honest, I found the not-lambda version easier to understand.

py3 deprecates cmp, thus the problem.

mineo · 2017-04-05T18:02:53Z

picard/ui/options/interface.py

@@ -223,7 +223,7 @@ def _all_list_items(self):

    def _added_actions(self):
        actions = self._all_list_items()
-        actions = filter(lambda x: x != 'separator', actions)
+        actions = [action for action in actions if action != 'separator']


FWIW, you can just do actions = set(action for .... ) here.

mineo · 2017-04-05T18:04:49Z

picard/ui/options/plugins.py

@@ -33,10 +34,6 @@
 from picard.ui.ui_options_plugins import Ui_PluginsOptionsPage


-def cmp_plugins(a, b):


The benefit of the explicitly defined function is that there's only one place it's defined, instead of twice.

Py3 deprecates cmp.

I agree with @mineo. If we're making the same function twice, it would be better to make it once.

fcmp = lambda x: locale.strxfrm(x[2]) is exactly the same as

def fcmp(x): return locale.strxfrm(x[2])

And can be used in the same manner, but the latter has the benefit of being unittestable and docstringable.

mineo · 2017-04-05T18:07:33Z

picard/util/astrcmp.c

-	(void)Py_InitModule("astrcmp", AstrcmpMethods);
-}
+    PyModuleDef_HEAD_INIT,
+    "astrcmp", /* name of module */


Nitpick: either let all comments here begin one space after the comma or align the slashes.

mineo · 2017-04-05T18:09:00Z

picard/util/imageinfo.py

 import struct
+from picard.compat import StringIO


If we're moving to Python 3, just remove compat.py and use whatever the correct import is.

sambhav · 2017-04-05T18:23:17Z

This is not a working port, I am currently working on it. It wont run and it doesn't pass the tests.

sip.setapi is no longer needed with PyQt5 and py3. Thus it was removed.

zas · 2017-04-07T11:41:32Z

Tested with py3.5 and pyqt5.8, reported issues were all fixed. Good job, @samj1912 !

Comments addressed

resources/README: Move to Qt5 & Python 3

sambhav force-pushed the py3 branch 4 times, most recently from 8dae232 to c1b6543 Compare March 25, 2017 15:43

zas reviewed Mar 25, 2017

View reviewed changes

sambhav changed the title ~~Port to Py3(WIP)~~ PICARD-558: Port to Py3(WIP) Mar 25, 2017

sambhav force-pushed the py3 branch 2 times, most recently from c9b17f2 to 8905f2e Compare March 30, 2017 14:03

zas requested changes Apr 2, 2017

View reviewed changes

sambhav force-pushed the py3 branch 3 times, most recently from 1ebf223 to db7c8e0 Compare April 3, 2017 06:11

sambhav force-pushed the py3 branch 5 times, most recently from 44fa112 to 4b34890 Compare April 4, 2017 20:43

Freso suggested changes Apr 5, 2017

View reviewed changes

sambhav force-pushed the py3 branch 8 times, most recently from df27879 to ef66b27 Compare April 5, 2017 18:11

mineo previously requested changes Apr 5, 2017

View reviewed changes

sambhav force-pushed the py3 branch from ef66b27 to 8460566 Compare April 5, 2017 18:19

sambhav added 12 commits April 7, 2017 16:06

Add a json_load util function for py3 compat issues

2548897

Add support for hashable ListWidgetItem

b910d0c

Add sorting key for data

80ec542

Fix bytes/string issue with URLs

93cd519

Add a builtin for handling string coversions

1d658bb

Add name to author credits

b4d9a65

Fix bytes/str issue

73c1250

Convert pattern to string

09b3981

Remove deprecated __unicode__

d5ec9a9

Fix drag and drop for itemviews

94d13f1

Test against more python qt versions

e4e62bf

Fix encoding issues in file paths

1e00999

sambhav force-pushed the py3 branch from 9a1da3a to 1e00999 Compare April 7, 2017 10:37

sambhav added 3 commits April 7, 2017 16:09

Update flake8 config with new builtins

d9a9c5b

Remove unnecessary module

51d19ce

Remove unnecessary imports

8ac37eb

sambhav force-pushed the py3 branch from 78164c4 to 8ac37eb Compare April 7, 2017 11:11

Fix py3 compatibility

9992ade

sip.setapi is no longer needed with PyQt5 and py3. Thus it was removed.

zas approved these changes Apr 7, 2017

View reviewed changes

sambhav force-pushed the py3 branch 2 times, most recently from 5441854 to 72ac5b3 Compare April 7, 2017 12:02

Update install instructions

9a35ae7

sambhav force-pushed the py3 branch from 72ac5b3 to 9a35ae7 Compare April 7, 2017 12:03

zas changed the title ~~PICARD-558: Port to Py3(WIP)~~ PICARD-558: Initial port to Py3 Apr 7, 2017

zas merged commit 4f759c7 into metabrainz:master Apr 7, 2017

mineo referenced this pull request Apr 8, 2017

Merge pull request #688 from mineo/resources-readme

3d6f66d

resources/README: Move to Qt5 & Python 3

sambhav deleted the py3 branch February 9, 2018 22:04

zas mentioned this pull request Sep 6, 2018

Deprecate string_() and related cleanup #958

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PICARD-558: Initial port to Py3 #664

PICARD-558: Initial port to Py3 #664

sambhav commented Mar 25, 2017 •

edited

Loading

zas Mar 25, 2017

zas Mar 25, 2017

sambhav Mar 25, 2017

zas Apr 2, 2017

zas Apr 2, 2017

zas Apr 2, 2017

sambhav Apr 3, 2017

zas commented Apr 3, 2017 •

edited

Loading

Freso left a comment

Freso Apr 5, 2017

Freso Apr 5, 2017

mineo left a comment

mineo Apr 5, 2017

mineo Apr 5, 2017

sambhav Apr 5, 2017

mineo Apr 5, 2017

mineo Apr 5, 2017

sambhav Apr 5, 2017

Freso Apr 7, 2017 •

edited

Loading

mineo Apr 5, 2017

mineo Apr 5, 2017

sambhav commented Apr 5, 2017

zas commented Apr 7, 2017

		@@ -33,10 +34,6 @@
		from picard.ui.ui_options_plugins import Ui_PluginsOptionsPage


		def cmp_plugins(a, b):

PICARD-558: Initial port to Py3 #664

PICARD-558: Initial port to Py3 #664

Conversation

sambhav commented Mar 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zas commented Apr 3, 2017 • edited Loading

Freso left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mineo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Freso Apr 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sambhav commented Apr 5, 2017

zas commented Apr 7, 2017

sambhav commented Mar 25, 2017 •

edited

Loading

zas commented Apr 3, 2017 •

edited

Loading

Freso Apr 7, 2017 •

edited

Loading