Format code with black

.github/workflows/ci.yml

@@ -2,30 +2,12 @@ name: ci
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
-  check:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y libgpgme11-dev
-        curl -sSL https://install.python-poetry.org | python3 -
-        poetry install -n
-    - name: Check code
-      run: poetry run black bmaptools/* tests/* --check
-
   test:
-    needs: check
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -47,3 +29,9 @@ jobs:
         poetry install -n
     - name: Run tests
       run: poetry run python -m unittest -bv
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: psf/black@stable

bmaptool/BmapCopy.py

@@ -624,14 +624,14 @@ def _get_data(self, verify):
 
         _log.debug("the reader thread has started")
         try:
-            for (first, last, chksum) in self._get_block_ranges():
+            for first, last, chksum in self._get_block_ranges():
                 if verify and chksum:
                     hash_obj = hashlib.new(self._cs_type)
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err:

tests/oldcodebase/BmapCopy1_0.py

@@ -425,14 +425,14 @@ def _get_data(self, verify):
           * 'buf' a buffer containing the batch data."""
 
         try:
-            for (first, last, sha1) in self._get_block_ranges():
+            for first, last, sha1 in self._get_block_ranges():
                 if verify and sha1:
                     hash_obj = hashlib.new("sha1")
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err:

tests/oldcodebase/BmapCopy2_0.py

@@ -376,14 +376,14 @@ def _get_data(self, verify):
           * 'buf' a buffer containing the batch data."""
 
         try:
-            for (first, last, sha1) in self._get_block_ranges():
+            for first, last, sha1 in self._get_block_ranges():
                 if verify and sha1:
                     hash_obj = hashlib.new("sha1")
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err:

tests/oldcodebase/BmapCopy2_1.py

@@ -375,14 +375,14 @@ def _get_data(self, verify):
           * 'buf' a buffer containing the batch data."""
 
         try:
-            for (first, last, sha1) in self._get_block_ranges():
+            for first, last, sha1 in self._get_block_ranges():
                 if verify and sha1:
                     hash_obj = hashlib.new("sha1")
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err:

tests/oldcodebase/BmapCopy2_2.py

@@ -376,14 +376,14 @@ def _get_data(self, verify):
           * 'buf' a buffer containing the batch data."""
 
         try:
-            for (first, last, sha1) in self._get_block_ranges():
+            for first, last, sha1 in self._get_block_ranges():
                 if verify and sha1:
                     hash_obj = hashlib.new("sha1")
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err:

tests/oldcodebase/BmapCopy2_3.py

@@ -412,14 +412,14 @@ def _get_data(self, verify):
           * 'buf' a buffer containing the batch data."""
 
         try:
-            for (first, last, sha1) in self._get_block_ranges():
+            for first, last, sha1 in self._get_block_ranges():
                 if verify and sha1:
                     hash_obj = hashlib.new("sha1")
 
                 self._f_image.seek(first * self.block_size)
 
                 iterator = self._get_batches(first, last)
-                for (start, end, length) in iterator:
+                for start, end, length in iterator:
                     try:
                         buf = self._f_image.read(length * self.block_size)
                     except IOError as err: