From 73cbac2293c13db6893b6ef127ade664443940da Mon Sep 17 00:00:00 2001 From: tekktrik <89490472+tekktrik@users.noreply.github.com> Date: Sat, 30 Oct 2021 17:21:57 -0400 Subject: [PATCH 1/5] Fix linting Changed string.format to f-strings --- adafruit_gps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_gps.py b/adafruit_gps.py index 10bc89c..a64e33c 100644 --- a/adafruit_gps.py +++ b/adafruit_gps.py @@ -298,7 +298,7 @@ def send_command(self, command, add_checksum=True): for char in command: checksum ^= char self.write(b"*") - self.write(bytes("{:02x}".format(checksum).upper(), "ascii")) + self.write(bytes(f"{checksum:02x}").upper(), "ascii") self.write(b"\r\n") @property @@ -557,7 +557,7 @@ def _parse_gsa(self, talker, data): satlist = list(filter(None, data[2:-4])) self.sat_prns = [] for sat in satlist: - self.sat_prns.append("{}{}".format(talker, sat)) + self.sat_prns.append("{talker}{sat}") # PDOP, dilution of precision self.pdop = _parse_float(data[14]) @@ -602,7 +602,7 @@ def _parse_gsv(self, talker, data): j = i * 4 value = ( # Satellite number - "{}{}".format(talker, sat_tup[0 + j]), + f"{talker}{sat_tup[0 + j]}", # Elevation in degrees sat_tup[1 + j], # Azimuth in degrees From f5b00ec3db9ce2fac37220e699da1550767a335d Mon Sep 17 00:00:00 2001 From: tekktrik <89490472+tekktrik@users.noreply.github.com> Date: Sat, 30 Oct 2021 17:27:44 -0400 Subject: [PATCH 2/5] Fix parentheses for write() --- adafruit_gps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_gps.py b/adafruit_gps.py index a64e33c..47b2dd9 100644 --- a/adafruit_gps.py +++ b/adafruit_gps.py @@ -298,7 +298,7 @@ def send_command(self, command, add_checksum=True): for char in command: checksum ^= char self.write(b"*") - self.write(bytes(f"{checksum:02x}").upper(), "ascii") + self.write(bytes(f"{checksum:02x}".upper(), "ascii")) self.write(b"\r\n") @property From daa037bac07f9e67f67f9b5c7563e3b2f94a41c5 Mon Sep 17 00:00:00 2001 From: tekktrik <89490472+tekktrik@users.noreply.github.com> Date: Sat, 30 Oct 2021 17:27:57 -0400 Subject: [PATCH 3/5] Add missing 'f' to make an f-string --- adafruit_gps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_gps.py b/adafruit_gps.py index 47b2dd9..34d0aa6 100644 --- a/adafruit_gps.py +++ b/adafruit_gps.py @@ -557,7 +557,7 @@ def _parse_gsa(self, talker, data): satlist = list(filter(None, data[2:-4])) self.sat_prns = [] for sat in satlist: - self.sat_prns.append("{talker}{sat}") + self.sat_prns.append(f"{talker}{sat}") # PDOP, dilution of precision self.pdop = _parse_float(data[14]) From 5c0b0cfc5d4f371dd6f9658a5245c696f6c76c95 Mon Sep 17 00:00:00 2001 From: tekktrik <89490472+tekktrik@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:05:40 -0400 Subject: [PATCH 4/5] Revert changes Remove changes to convert to f-strings --- adafruit_gps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_gps.py b/adafruit_gps.py index 34d0aa6..10bc89c 100644 --- a/adafruit_gps.py +++ b/adafruit_gps.py @@ -298,7 +298,7 @@ def send_command(self, command, add_checksum=True): for char in command: checksum ^= char self.write(b"*") - self.write(bytes(f"{checksum:02x}".upper(), "ascii")) + self.write(bytes("{:02x}".format(checksum).upper(), "ascii")) self.write(b"\r\n") @property @@ -557,7 +557,7 @@ def _parse_gsa(self, talker, data): satlist = list(filter(None, data[2:-4])) self.sat_prns = [] for sat in satlist: - self.sat_prns.append(f"{talker}{sat}") + self.sat_prns.append("{}{}".format(talker, sat)) # PDOP, dilution of precision self.pdop = _parse_float(data[14]) @@ -602,7 +602,7 @@ def _parse_gsv(self, talker, data): j = i * 4 value = ( # Satellite number - f"{talker}{sat_tup[0 + j]}", + "{}{}".format(talker, sat_tup[0 + j]), # Elevation in degrees sat_tup[1 + j], # Azimuth in degrees From ecf77cb11873bc1dfd0a8928ea245f31f74425ef Mon Sep 17 00:00:00 2001 From: tekktrik <89490472+tekktrik@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:06:33 -0400 Subject: [PATCH 5/5] Disable f-string suggestion in .pylintrc --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index 845d2b0..fc11b6d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -55,7 +55,7 @@ confidence= # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" # disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call -disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement +disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement,consider-using-f-string # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option