Linting, formatting, typing

tests/test_upload.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import os
 
 import pretend
 import pytest

twine/commands/upload.py

@@ -62,7 +62,7 @@ def upload(upload_settings: settings.Settings, dists: List[str]) -> None:
     print(f"Uploading distributions to {repository_url}")
     if upload_settings.verbose:
         for dist_to_upload in uploads:
-            #If the file size is <.1 MB we display in KB
+            # If the file size is <.1 MB we display in KB
             file_size, size_unit = utils.get_file_size(dist_to_upload)
             print(f"   {dist_to_upload} ({file_size} {size_unit})")
         print("\n")

twine/utils.py

@@ -23,6 +23,7 @@
 from typing import Dict
 from typing import Optional
 from typing import Sequence
+from typing import Tuple
 from typing import Union
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
@@ -31,6 +32,7 @@
 import rfc3986
 
 from twine import exceptions
+
 # Shim for input to allow testing.
 input_func = input
 
@@ -158,14 +160,14 @@ def normalize_repository_url(url: str) -> str:
     return urlunparse(parsed)
 
 
-def get_file_size(filepath : str) -> (float, str):
-    """Calculates and returns the file size and unit"""
-    #If the file size is <.1 MB we display in KB
+def get_file_size(filepath: str) -> Tuple[float, str]:
+    """Return the file size and unit of size following PyPI's file size format."""
+    # If the file size is <.1 MB we display in KB
     size_unit = "MB"
-    file_size = round(os.path.getsize(filepath)/(1024 * 1024), 1)
+    file_size = round(os.path.getsize(filepath) / (1024 * 1024), 1)
     if not file_size:
         size_unit = "KB"
-        file_size = round(os.path.getsize(filepath)/(1024), 1)
+        file_size = round(os.path.getsize(filepath) / (1024), 1)
     return file_size, size_unit