Merge lp:~paulliu/qr-tools/python3 into lp:qr-tools

[Ying-Chun Liu]

Porting to python3

Python2 is end of life. We have to port this project to python3 so that we can continue using it.

[Ramiro Algozino (algozino)]

Lgtm. The packaging is pending yet though.

Thank you very much for your collaboration!

review: Approve

=== modified file 'qrtools.py'
--- qrtools.py	2018-03-01 17:24:59 +0000
+++ qrtools.py	2019-09-12 18:29:16 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Authors:
 #   David Green <[e-mail]>
@@ -35,7 +35,7 @@
     import Image
 import re
 from codecs import BOM_UTF8
-from urlparse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
@@ -170,7 +170,7 @@
         utf8_bytedata = None
         try:
             utf8_bytedata = self.data_to_string()
-        except QR.EncodeError, e:
+        except QR.EncodeError as e:
             eprint(repr(e))
             return 1
 
@@ -178,8 +178,8 @@
             command = [
                 'qrencode',
                 '-o', self.filename,
-                '-s', unicode(self.pixel_size),
-                '-m', unicode(self.margin_size),
+                '-s', str(self.pixel_size),
+                '-m', str(self.margin_size),
                 '-l', self.level,
                 '-t', ext,
                 self.data_to_string()
@@ -188,8 +188,8 @@
             command = [
                 'qrencode',
                 '-o', self.filename,
-                '-s', unicode(self.pixel_size),
-                '-m', unicode(self.margin_size),
+                '-s', str(self.pixel_size),
+                '-m', str(self.margin_size),
                 '-l', self.level,
                 #'-t', ext,
                 self.data_to_string()
@@ -222,7 +222,7 @@
                 # clean up
                 del(image)
                 #Assuming data is encoded in utf8
-                self.data = symbol.data.decode(u'utf-8')
+                self.data = symbol.data
                 self.data_type = self.data_recognise()
                 return True
         else:
@@ -267,19 +267,19 @@
         #FIXME: Probably a future bug in newer versions.
         #We should at least check if the binary is available.
         p = subprocess.Popen(['qrencode','-V'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        version_text = p.communicate()[1]
-        version = re.search('version\s([\d.]*)',version_text) 
+        version_text = p.communicate()[0]
+        version = re.search('version\s([\d.]*)',str(version_text)) 
         if version:
             version_number = version.group(1)
         else:
             version_number = -1
-        #print "Using qrencode version:", version_number
+        #print ("Using qrencode version:", version_number)
         return version_number
 
     def get_qrencode_types(self):
         p = subprocess.Popen(['qrencode','-h'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         help_text = p.communicate()[1]
-        types_text = re.search('-t {([\w,]*)}', help_text) 
+        types_text = re.search('-t {([\w,]*)}', str(help_text)) 
         if types_text:
             types = types_text.group(1).split(',')
             #print "The following format types have been found!:", types
 
=== modified file 'qtqr.py'
--- qtqr.py	2018-06-04 01:50:55 +0000
+++ qtqr.py	2019-09-12 18:29:16 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #-*- encoding: utf-8 -*-
 
 """
@@ -16,7 +16,7 @@
 try:
     # import pynotify
     if not pynotify.init("QtQR"):
-        print "DEBUG: There was a problem initializing the pynotify module"
+        print ("DEBUG: There was a problem initializing the pynotify module")
     NOTIFY = True
 except:
     NOTIFY = False
@@ -43,17 +43,17 @@
 
         # Templates for creating QRCodes supported by qrtools
         self.templates = {
-            "text": unicode(self.tr("Text")),
-            "url": unicode(self.tr("URL")),
-            "bookmark": unicode(self.tr("Bookmark")),
-            "emailmessage": unicode(self.tr("E-Mail")),
-            "telephone": unicode(self.tr("Telephone Number")),
-            "phonebook": unicode(self.tr("Contact Information (PhoneBook)")),
-            "sms": unicode(self.tr("SMS")),
-            "mms": unicode(self.tr("MMS")),
-            "geo": unicode(self.tr("Geolocalization")),
-            "wifi": unicode(self.tr("WiFi Network")),
-            "sepa": unicode(self.tr("SEPA Single Payment")),
+            "text": str(self.tr("Text")),
+            "url": str(self.tr("URL")),
+            "bookmark": str(self.tr("Bookmark")),
+            "emailmessage": str(self.tr("E-Mail")),
+            "telephone": str(self.tr("Telephone Number")),
+            "phonebook": str(self.tr("Contact Information (PhoneBook)")),
+            "sms": str(self.tr("SMS")),
+            "mms": str(self.tr("MMS")),
+            "geo": str(self.tr("Geolocalization")),
+            "wifi": str(self.tr("WiFi Network")),
+            "sepa": str(self.tr("SEPA Single Payment")),
             }
         # With this we make the dict bidirectional
         self.templates.update( dict((self.templates[k], k) for k in self.templates))
@@ -440,7 +440,7 @@
         self.smsBodyEdit.textChanged.connect(self.qrencode)
         self.smsBodyEdit.textChanged.connect(
             lambda: self.smsCharCount.setText(
-                unicode(self.tr("characters count: %s - %d message(s)")) % (
+                str(self.tr("characters count: %s - %d message(s)")) % (
                 len(self.smsBodyEdit.toPlainText()),
                 ceil(len(self.smsBodyEdit.toPlainText()) / 160.0)
                 )                    
@@ -508,35 +508,35 @@
         fileName = kargs.get('fileName')
         #Functions to get the correct data
         data_fields = {
-            "text": unicode(self.textEdit.toPlainText()),
-            "url": unicode(self.urlEdit.text()),
-            "bookmark": ( unicode(self.bookmarkTitleEdit.text()), unicode(self.bookmarkUrlEdit.text()) ),
-            "email": unicode(self.emailEdit.text()),
-            "emailmessage": ( unicode(self.emailEdit.text()), unicode(self.emailSubjectEdit.text()), unicode(self.emailBodyEdit.toPlainText()) ),
-            "telephone": unicode(self.telephoneEdit.text()),
-            "phonebook": (('N',unicode(self.phonebookNameEdit.text())),
-                          ('TEL', unicode(self.phonebookTelEdit.text())),
-                          ('EMAIL',unicode(self.phonebookEMailEdit.text())),
-                          ('NOTE', unicode(self.phonebookNoteEdit.text())),
-                          ('BDAY', unicode(self.phonebookBirthdayEdit.date().toString("yyyyMMdd")) if self.phonebookBirthdayLabel.isChecked() else ""), #YYYYMMDD
-                          ('ADR', unicode(self.phonebookAddressEdit.text())),  #The fields divided by commas (,) denote PO box, room number, house number, city, prefecture, zip code and country, in order.
-                          ('URL', unicode(self.phonebookUrlEdit.text())),
+            "text": str(self.textEdit.toPlainText()),
+            "url": str(self.urlEdit.text()),
+            "bookmark": ( str(self.bookmarkTitleEdit.text()), str(self.bookmarkUrlEdit.text()) ),
+            "email": str(self.emailEdit.text()),
+            "emailmessage": ( str(self.emailEdit.text()), str(self.emailSubjectEdit.text()), str(self.emailBodyEdit.toPlainText()) ),
+            "telephone": str(self.telephoneEdit.text()),
+            "phonebook": (('N',str(self.phonebookNameEdit.text())),
+                          ('TEL', str(self.phonebookTelEdit.text())),
+                          ('EMAIL',str(self.phonebookEMailEdit.text())),
+                          ('NOTE', str(self.phonebookNoteEdit.text())),
+                          ('BDAY', str(self.phonebookBirthdayEdit.date().toString("yyyyMMdd")) if self.phonebookBirthdayLabel.isChecked() else ""), #YYYYMMDD
+                          ('ADR', str(self.phonebookAddressEdit.text())),  #The fields divided by commas (,) denote PO box, room number, house number, city, prefecture, zip code and country, in order.
+                          ('URL', str(self.phonebookUrlEdit.text())),
                           # ('NICKNAME', ''),
                         ),
-            "sms": ( unicode(self.smsNumberEdit.text()), unicode(self.smsBodyEdit.toPlainText()) ),
-            "mms": ( unicode(self.mmsNumberEdit.text()), unicode(self.mmsBodyEdit.toPlainText()) ),
-            "geo": ( unicode(self.geoLatEdit.text()), unicode(self.geoLongEdit.text()) ),
-            "wifi": ( unicode(self.wifiSSIDEdit.text()), (u"WEP",u"WPA",u"nopass")[self.wifiEncryptionType.currentIndex()], unicode(self.wifiPasswordEdit.text())),
-            "sepa": (unicode(self.sepaNameEdit.text()),
-                     unicode(self.sepaAccountEdit.text()),
-                     unicode(self.sepaBNCEdit.text()),
-                     unicode(self.sepaAmountEdit.text()),
-                     unicode(self.sepaReasonEdit.text()),
-                     unicode(self.sepaCurrencyEdit.text())
+            "sms": ( str(self.smsNumberEdit.text()), str(self.smsBodyEdit.toPlainText()) ),
+            "mms": ( str(self.mmsNumberEdit.text()), str(self.mmsBodyEdit.toPlainText()) ),
+            "geo": ( str(self.geoLatEdit.text()), str(self.geoLongEdit.text()) ),
+            "wifi": ( str(self.wifiSSIDEdit.text()), (u"WEP",u"WPA",u"nopass")[self.wifiEncryptionType.currentIndex()], str(self.wifiPasswordEdit.text())),
+            "sepa": (str(self.sepaNameEdit.text()),
+                     str(self.sepaAccountEdit.text()),
+                     str(self.sepaBNCEdit.text()),
+                     str(self.sepaAmountEdit.text()),
+                     str(self.sepaReasonEdit.text()),
+                     str(self.sepaCurrencyEdit.text())
                      ),
         }
 
-        data_type = unicode(self.templates[unicode(self.selector.currentText())])
+        data_type = str(self.templates[str(self.selector.currentText())])
         data = data_fields[data_type]
         
         level = (u'L',u'M',u'Q',u'H')
@@ -545,14 +545,14 @@
             if data_type == 'emailmessage' and data[1] == '' and data[2] == '':
                 data_type = 'email'
                 data = data_fields[data_type]
-            qr = QR(pixel_size = unicode(self.pixelSize.value()),
+            qr = QR(pixel_size = str(self.pixelSize.value()),
                     data = data,
-                    level = unicode(level[self.ecLevel.currentIndex()]),
-                    margin_size = unicode(self.marginSize.value()),
+                    level = str(level[self.ecLevel.currentIndex()]),
+                    margin_size = str(self.marginSize.value()),
                     data_type = data_type,
                     )
             error = 1
-            if type(fileName) is not unicode:
+            if type(fileName) is not str:
                 error = qr.encode()
             else:
                 error = qr.encode(fileName)
@@ -563,12 +563,12 @@
                 if NOTIFY:
                     n = pynotify.Notification(
                         "QtQR",
-                        unicode(self.tr("ERROR: Something went wrong while trying to generate the QR Code.")),
+                        str(self.tr("ERROR: Something went wrong while trying to generate the QR Code.")),
                         "qtqr"
                         )
                     n.show()
                 else:
-                    print "Something went wrong while trying to generate the QR Code"
+                    print ("Something went wrong while trying to generate the QR Code")
             qr.destroy()
         else:
             self.saveButton.setEnabled(False)
@@ -596,19 +596,19 @@
             and not fn.lower().endswith(u".utf8") \
             and not fn.lower().endswith(u".ansiutf8"):
                 fn += u".png"
-            self.qrencode(fileName=unicode(fn))
+            self.qrencode(fileName=str(fn))
             if NOTIFY:
                 n = pynotify.Notification(
-                    unicode(self.tr("Save QR Code")),
-                    unicode(self.tr("QR Code succesfully saved to %s")) % fn,
+                    str(self.tr("Save QR Code")),
+                    str(self.tr("QR Code succesfully saved to %s")) % fn,
                     "qtqr"
                     )
                 n.show()
             else:
                QtWidgets.QMessageBox.information(
                     self, 
-                    unicode(self.tr('Save QRCode')),
-                    unicode(self.tr('QRCode succesfully saved to <b>%s</b>.')) % fn
+                    str(self.tr('Save QRCode')),
+                    str(self.tr('QRCode succesfully saved to <b>%s</b>.')) % fn
                     )
 
     def decodeFile(self, fn=None):
@@ -619,7 +619,7 @@
                 filter=self.tr('Images (*.png *.jpg);; All Files (*.*)')
                 )
             if fn:
-                fn = unicode(fn)
+                fn = str(fn)
             else:
                 return
         if os.path.isfile(fn):
@@ -638,7 +638,7 @@
                 QtWidgets.QMessageBox.information(
                     self,
                     self.tr('Decode File'),
-                    unicode(self.tr('No QRCode could be found in file: <b>%s</b>.')) % fn
+                    str(self.tr('No QRCode could be found in file: <b>%s</b>.')) % fn
                 )
             qr.destroy()
         else:
@@ -652,26 +652,26 @@
 
     def showInfo(self, qr):
         dt = qr.data_type
-        print dt.encode(u"utf-8") + ':',
+        print (str(dt) + ':', end='')
         data = qr.data_decode[dt](qr.data)
         if type(data) == tuple:
             for d in data:
-                print d.encode(u"utf-8")
+                print (d.encode(u"utf-8"))
         elif type(data) == dict:
                 # FIX-ME: Print the decoded symbols
-                print "Dict"
-                print data.keys()
-                print data.values()
+                print ("Dict")
+                print (data.keys())
+                print (data.values())
         else:
-            print data.encode(u"utf-8")
+            print (data.encode(u"utf-8"))
         msg = {
-            'text': lambda : unicode(self.tr("QRCode contains the following text:\n\n%s")) % (data),
-            'url': lambda : unicode(self.tr("QRCode contains the following url address:\n\n%s")) % (data),
-            'bookmark': lambda: unicode(self.tr("QRCode contains a bookmark:\n\nTitle: %s\nURL: %s")) % (data),
-            'email': lambda : unicode(self.tr("QRCode contains the following e-mail address:\n\n%s")) % (data),
-            'emailmessage': lambda : unicode(self.tr("QRCode contains an e-mail message:\n\nTo: %s\nSubject: %s\nMessage: %s")) % (data),
-            'telephone': lambda : unicode(self.tr("QRCode contains a telephone number: ")) + (data),
-            'phonebook': lambda : unicode(self.tr("QRCode contains a phonebook entry:\n\nName: %s\nTel: %s\nE-Mail: %s\nNote: %s\nBirthday: %s\nAddress: %s\nURL: %s")) %
+            'text': lambda : str(self.tr("QRCode contains the following text:\n\n%s")) % (data),
+            'url': lambda : str(self.tr("QRCode contains the following url address:\n\n%s")) % (data),
+            'bookmark': lambda: str(self.tr("QRCode contains a bookmark:\n\nTitle: %s\nURL: %s")) % (data),
+            'email': lambda : str(self.tr("QRCode contains the following e-mail address:\n\n%s")) % (data),
+            'emailmessage': lambda : str(self.tr("QRCode contains an e-mail message:\n\nTo: %s\nSubject: %s\nMessage: %s")) % (data),
+            'telephone': lambda : str(self.tr("QRCode contains a telephone number: ")) + (data),
+            'phonebook': lambda : str(self.tr("QRCode contains a phonebook entry:\n\nName: %s\nTel: %s\nE-Mail: %s\nNote: %s\nBirthday: %s\nAddress: %s\nURL: %s")) %
                 (data.get('N') or "", 
                  data.get('TEL') or "", 
                  data.get('EMAIL') or "", 
@@ -679,11 +679,11 @@
                  QtCore.QDate.fromString(data.get('BDAY') or "",'yyyyMMdd').toString(), 
                  data.get('ADR') or "",
                  data.get('URL') or ""),
-            'sms': lambda : unicode(self.tr("QRCode contains the following SMS message:\n\nTo: %s\nMessage: %s")) % (data),
-            'mms': lambda : unicode(self.tr("QRCode contains the following MMS message:\n\nTo: %s\nMessage: %s")) % (data),
-            'geo': lambda : unicode(self.tr("QRCode contains the following coordinates:\n\nLatitude: %s\nLongitude:%s")) % (data),
-            'wifi': lambda : unicode(self.tr("QRCode contains the following WiFi Network Configuration:\n\nSSID: %s\nEncryption Type: %s\nPassword: %s")) % (data),
-            'sepa': lambda : unicode(self.tr("QRCode contains the following Single Payment Information:\n\nName: %s\nAccount: %s\nBNC: %s\nAmmount: %s\nReason: %s\nCurrency: %s\n")) % (
+            'sms': lambda : str(self.tr("QRCode contains the following SMS message:\n\nTo: %s\nMessage: %s")) % (data),
+            'mms': lambda : str(self.tr("QRCode contains the following MMS message:\n\nTo: %s\nMessage: %s")) % (data),
+            'geo': lambda : str(self.tr("QRCode contains the following coordinates:\n\nLatitude: %s\nLongitude:%s")) % (data),
+            'wifi': lambda : str(self.tr("QRCode contains the following WiFi Network Configuration:\n\nSSID: %s\nEncryption Type: %s\nPassword: %s")) % (data),
+            'sepa': lambda : str(self.tr("QRCode contains the following Single Payment Information:\n\nName: %s\nAccount: %s\nBNC: %s\nAmmount: %s\nReason: %s\nCurrency: %s\n")) % (
                 data.get('name')[0] or '',
                 data.get('account')[0] or '',
                 data.get('bnc')[0] or '',
@@ -743,7 +743,7 @@
                 link = data[1]
             else:
                 link = qr.data_decode[qr.data_type](qr.data)
-            print u"Opening " + link
+            print (u"Opening " + link)
             QtGui.QDesktopServices.openUrl(QtCore.QUrl(link))
         elif rsp == 0:
             #Edit the code
@@ -813,6 +813,7 @@
                 self.tabs.setCurrentIndex(tabIndex)
 
     def decodeWebcam(self):
+        device = None
         vdDialog = VideoDevices()
         if len(vdDialog.videoDevices) == 1:
             device = vdDialog.videoDevices[0][1]
@@ -837,7 +838,7 @@
         QtWidgets.QMessageBox.about(
             self,
             self.tr("About QtQR"),
-            unicode(self.tr('<h1>QtQR %s</h1><p>A simple software for creating and decoding QR Codes that uses python-qrtools as backend. Both are part of the <a href="https://launchpad.net/qr-tools">QR Tools</a> project.</p><p></p><p>This is Free Software: GNU-GPLv3</p><p></p><p>Please visit our website for more information and to check out the code:<br /><a href="https://code.launchpad.net/qr-tools/">https://code.launchpad.net/qr-tools/</p><p>copyright &copy; Ramiro Algozino &lt;<a href="mailto:[e-mail]">[e-mail]</a>&gt;</p>')) % __version__,
+            str(self.tr('<h1>QtQR %s</h1><p>A simple software for creating and decoding QR Codes that uses python-qrtools as backend. Both are part of the <a href="https://launchpad.net/qr-tools">QR Tools</a> project.</p><p></p><p>This is Free Software: GNU-GPLv3</p><p></p><p>Please visit our website for more information and to check out the code:<br /><a href="https://code.launchpad.net/qr-tools/">https://code.launchpad.net/qr-tools/</p><p>copyright &copy; Ramiro Algozino &lt;<a href="mailto:[e-mail]">[e-mail]</a>&gt;</p>')) % __version__,
         )
 
     def dragEnterEvent(self, event):
@@ -848,9 +849,9 @@
         for url in event.mimeData().urls():
             fn = url.toLocalFile()
             if fn:
-                self.decodeFile(unicode(fn))
+                self.decodeFile(str(fn))
             else:
-                print "DEBUG: Downloading dropped file from %s" % url.toString() 
+                print ("DEBUG: Downloading dropped file from %s" % url.toString() )
                 self.NetAccessMgr.get(QtNetwork.QNetworkRequest(url))
                 # FIX-ME: We should check if the download gets timeout.
                 # and notify that we are downloading, the download could
@@ -861,7 +862,7 @@
 
 
     def handleNetworkData(self, QNetReply):
-        print "DEBUG: Finished downloading file."
+        print ("DEBUG: Finished downloading file.")
         tmpfn = '/tmp/qrtemp.png'
         fn = open(tmpfn,"w")
         fn.write(QNetReply.readAll())
@@ -869,10 +870,10 @@
         self.decodeFile(tmpfn)
 
     def toggleShowPassword(self, status):
-	if status == 0:
-	    self.wifiPasswordEdit.setEchoMode(QtWidgets.QLineEdit.Password)
-	elif status == 2:
-	    self.wifiPasswordEdit.setEchoMode(QtWidgets.QLineEdit.Normal)
+        if status == 0:
+            self.wifiPasswordEdit.setEchoMode(QtWidgets.QLineEdit.Password)
+        elif status == 2:
+            self.wifiPasswordEdit.setEchoMode(QtWidgets.QLineEdit.Normal)
 
 class VideoDevices(QtWidgets.QDialog):
     def __init__(self):
@@ -924,7 +925,7 @@
     app = QtWidgets.QApplication(sys.argv)
     # This is to make Qt use locale configuration; i.e. Standard Buttons
     # in your system's language. 
-    locale = unicode(QtCore.QLocale.system().name())
+    locale = str(QtCore.QLocale.system().name())
     translator=QtCore.QTranslator()
     # translator.load(os.path.join(os.path.abspath(
         # os.path.dirname(__file__)),