Project

General

Profile

Actions

Bug #9555

closed

python 3 branch syntax errors

Added by Anders Knudsen over 2 years ago. Updated over 1 year ago.

Status:
Rejected
Priority:
High
Assignee:
-
Category:
-
Target version:
Start date:
11/18/2021
Due date:
% Done:

0%

Estimated time:
Chirp Version:
daily
Model affected:
(All models)
Platform:
Linux
Debug Log:
I read the instructions above:

Description

A few py2 things sneaked into the py3 branch.

Here's the diff to fix:

[:/projects/chirp.hg] py3(+3/-3) ☿ hg sum
parent: 3608:5da559ffde25
 Merge pull request #13 from mfncooper/fix_icomciv_set_memory
branch: py3
commit: 3 modified
update: (current)

[:/projects/chirp.hg] py3(+3/-3) ☿ hg diff
diff -r 5da559ffde25 chirp/drivers/vx6.py
--- a/chirp/drivers/vx6.py      Fri Oct 15 16:33:11 2021 -0700
+++ b/chirp/drivers/vx6.py      Thu Nov 18 09:37:17 2021 -0700
@@ -871,5 +871,5 @@
                 elif setting == "password":
                     newval = self._encode_chars(newval, 4)
                 setattr(_settings, setting, newval)
-            except Exception, e:
+            except Exception as e:
                 raise
diff -r 5da559ffde25 chirp/ui/mainapp.py
--- a/chirp/ui/mainapp.py       Fri Oct 15 16:33:11 2021 -0700
+++ b/chirp/ui/mainapp.py       Thu Nov 18 09:37:17 2021 -0700
@@ -1137,7 +1137,7 @@

         query = "http://chirp.danplanet.com/query/rb/1.0/app_direct" \
                 "?loc=%s&band=%s&dist=%s" % (loc, band, dist)
-        print query
+        print(query)

         # Do this in case the import process is going to take a while
         # to make sure we process events leading up to this
diff -r 5da559ffde25 chirp/ui/memdetail.py
--- a/chirp/ui/memdetail.py     Fri Oct 15 16:33:11 2021 -0700
+++ b/chirp/ui/memdetail.py     Thu Nov 18 09:37:17 2021 -0700
@@ -71,7 +71,7 @@
                 extra_name = self._name.split("_", 1)[1]
                 LOG.debug('Setting extra %s=%r' % (extra_name, newval))
                 self._memory.extra[extra_name].value = newval
-            except settings.InternalError, e:
+            except settings.InternalError as e:
                 self._errfn(self._name, str(e))
                 return str(e)
         else:
[:/projects/chirp.hg] py3(+3/-3) ☿

Actions

Also available in: Atom PDF