Merge branch 'adafruit_main' into patch-2

Author: FoamyGuy

.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
+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,unspecified-encoding
 
 # 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

adafruit_avrprog.py

@@ -132,53 +132,53 @@ def program_file(self, chip, file_name, verbose=False, verify=True):
 
         # create a file state dictionary
         file_state = {"line": 0, "ext_addr": 0, "eof": False}
-        file_state["f"] = open(file_name, "r")
+        with open(file_name, "r") as file_state[  # pylint: disable=unspecified-encoding
+            "f"
+        ]:
+            page_size = chip["page_size"]
 
-        page_size = chip["page_size"]
-
-        for page_addr in range(0, chip["flash_size"], page_size):
-            if verbose:
-                print("Programming page $%04X..." % page_addr, end="")
-            page_buffer = bytearray(page_size)
-            for b in range(page_size):
-                page_buffer[b] = 0xFF  # make an empty page
-
-            read_hex_page(file_state, page_addr, page_size, page_buffer)
-
-            if all(v == 255 for v in page_buffer):
+            for page_addr in range(0, chip["flash_size"], page_size):
                 if verbose:
-                    print("skipping")
-                continue
+                    print("Programming page $%04X..." % page_addr, end="")
+                page_buffer = bytearray(page_size)
+                for b in range(page_size):
+                    page_buffer[b] = 0xFF  # make an empty page
 
-            # print("From HEX file: ", page_buffer)
-            self._flash_page(bytearray(page_buffer), page_addr, page_size)
+                read_hex_page(file_state, page_addr, page_size, page_buffer)
 
-            if not verify:
-                if verbose:
-                    print("done!")
-                continue
+                if all(v == 255 for v in page_buffer):
+                    if verbose:
+                        print("skipping")
+                    continue
 
-            if verbose:
-                print("Verifying page @ $%04X" % page_addr)
-            read_buffer = bytearray(page_size)
-            self.read(page_addr, read_buffer)
-            # print("From memory: ", read_buffer)
+                # print("From HEX file: ", page_buffer)
+                self._flash_page(bytearray(page_buffer), page_addr, page_size)
 
-            if page_buffer != read_buffer:
-                if verbose:
-                    # pylint: disable=line-too-long
-                    print(
-                        "Verify fail at address %04X\nPage should be: %s\nBut contains: %s"
-                        % (page_addr, page_buffer, read_buffer)
-                    )
-                    # pylint: enable=line-too-long
-                self.end()
-                return False
+                if not verify:
+                    if verbose:
+                        print("done!")
+                    continue
 
-            if file_state["eof"]:
-                break  # we're done, bail!
+                if verbose:
+                    print("Verifying page @ $%04X" % page_addr)
+                read_buffer = bytearray(page_size)
+                self.read(page_addr, read_buffer)
+                # print("From memory: ", read_buffer)
+
+                if page_buffer != read_buffer:
+                    if verbose:
+                        # pylint: disable=line-too-long
+                        print(
+                            "Verify fail at address %04X\nPage should be: %s\nBut contains: %s"
+                            % (page_addr, page_buffer, read_buffer)
+                        )
+                        # pylint: enable=line-too-long
+                    self.end()
+                    return False
+
+                if file_state["eof"]:
+                    break  # we're done, bail!
 
-        file_state["f"].close()
         self.end()
         return True
 
@@ -192,40 +192,40 @@ def verify_file(self, chip, file_name, verbose=False):
 
         # create a file state dictionary
         file_state = {"line": 0, "ext_addr": 0, "eof": False}
-        file_state["f"] = open(file_name, "r")
+        with open(file_name, "r") as file_name[  # pylint: disable=unspecified-encoding
+            "f"
+        ]:
+            page_size = chip["page_size"]
+            clock_speed = getattr(chip, "clock_speed", _FAST_CLOCK)
+            self.begin(clock=clock_speed)
+            for page_addr in range(0x0, chip["flash_size"], page_size):
+                page_buffer = bytearray(page_size)
+                for b in range(page_size):
+                    page_buffer[b] = 0xFF  # make an empty page
+
+                read_hex_page(file_state, page_addr, page_size, page_buffer)
 
-        page_size = chip["page_size"]
-        clock_speed = getattr(chip, "clock_speed", _FAST_CLOCK)
-        self.begin(clock=clock_speed)
-        for page_addr in range(0x0, chip["flash_size"], page_size):
-            page_buffer = bytearray(page_size)
-            for b in range(page_size):
-                page_buffer[b] = 0xFF  # make an empty page
-
-            read_hex_page(file_state, page_addr, page_size, page_buffer)
-
-            if verbose:
-                print("Verifying page @ $%04X" % page_addr)
-            read_buffer = bytearray(page_size)
-            self.read(page_addr, read_buffer)
-            # print("From memory: ", read_buffer)
-            # print("From file  : ", page_buffer)
-
-            if page_buffer != read_buffer:
                 if verbose:
-                    # pylint: disable=line-too-long
-                    print(
-                        "Verify fail at address %04X\nPage should be: %s\nBut contains: %s"
-                        % (page_addr, page_buffer, read_buffer)
-                    )
-                    # pylint: enable=line-too-long
-                self.end()
-                return False
-
-            if file_state["eof"]:
-                break  # we're done, bail!
+                    print("Verifying page @ $%04X" % page_addr)
+                read_buffer = bytearray(page_size)
+                self.read(page_addr, read_buffer)
+                # print("From memory: ", read_buffer)
+                # print("From file  : ", page_buffer)
+
+                if page_buffer != read_buffer:
+                    if verbose:
+                        # pylint: disable=line-too-long
+                        print(
+                            "Verify fail at address %04X\nPage should be: %s\nBut contains: %s"
+                            % (page_addr, page_buffer, read_buffer)
+                        )
+                        # pylint: enable=line-too-long
+                    self.end()
+                    return False
+
+                if file_state["eof"]:
+                    break  # we're done, bail!
 
-        file_state["f"].close()
         self.end()
         return True