Merge pull request pypa#576 from bhrutledge/normalize-imports

Normalize to module imports

.isort.cfg

@@ -1,4 +1,6 @@
 [settings]
+# NOTE: Consider single_line_exclusions=typing in next version of isort
+force_single_line=True
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0

setup.py

@@ -11,9 +11,7 @@
 # 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.
-from setuptools import setup
+import setuptools
 
 
-setup(
-    use_scm_version=True,
-)
+setuptools.setup(use_scm_version=True)

tests/test_auth.py

@@ -1,6 +1,8 @@
 import pytest
 
-from twine import auth, exceptions, utils
+from twine import auth
+from twine import exceptions
+from twine import utils
 
 cred = auth.CredentialInput
 

tests/test_check.py

@@ -11,8 +11,12 @@
 # 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 io
+
 import pretend
 
+from twine import commands
+from twine import package as package_file
 from twine.commands import check
 
 
@@ -40,9 +44,9 @@ def test_str_representation(self):
 
 
 def test_check_no_distributions(monkeypatch):
-    stream = check.StringIO()
+    stream = io.StringIO()
 
-    monkeypatch.setattr(check, "_find_dists", lambda a: [])
+    monkeypatch.setattr(commands, "_find_dists", lambda a: [])
 
     assert not check.check("dist/*", output_stream=stream)
     assert stream.getvalue() == "No files to check.\n"
@@ -56,13 +60,15 @@ def test_check_passing_distribution(monkeypatch):
             "description_content_type": "text/markdown",
         }
     )
-    output_stream = check.StringIO()
+    output_stream = io.StringIO()
     warning_stream = ""
 
     monkeypatch.setattr(check, "_RENDERERS", {None: renderer})
-    monkeypatch.setattr(check, "_find_dists", lambda a: ["dist/dist.tar.gz"])
+    monkeypatch.setattr(commands, "_find_dists", lambda a: ["dist/dist.tar.gz"])
     monkeypatch.setattr(
-        check, "PackageFile", pretend.stub(from_filename=lambda *a, **kw: package),
+        package_file,
+        "PackageFile",
+        pretend.stub(from_filename=lambda *a, **kw: package),
     )
     monkeypatch.setattr(check, "_WarningStream", lambda: warning_stream)
 
@@ -79,13 +85,15 @@ def test_check_no_description(monkeypatch, capsys):
         }
     )
 
-    monkeypatch.setattr(check, "_find_dists", lambda a: ["dist/dist.tar.gz"])
+    monkeypatch.setattr(commands, "_find_dists", lambda a: ["dist/dist.tar.gz"])
     monkeypatch.setattr(
-        check, "PackageFile", pretend.stub(from_filename=lambda *a, **kw: package),
+        package_file,
+        "PackageFile",
+        pretend.stub(from_filename=lambda *a, **kw: package),
     )
 
     # used to crash with `AttributeError`
-    output_stream = check.StringIO()
+    output_stream = io.StringIO()
     check.check("dist/*", output_stream=output_stream)
     assert output_stream.getvalue() == (
         "Checking dist/dist.tar.gz: PASSED, with warnings\n"
@@ -103,13 +111,15 @@ def test_check_failing_distribution(monkeypatch):
             "description_content_type": "text/markdown",
         }
     )
-    output_stream = check.StringIO()
+    output_stream = io.StringIO()
     warning_stream = "WARNING"
 
     monkeypatch.setattr(check, "_RENDERERS", {None: renderer})
-    monkeypatch.setattr(check, "_find_dists", lambda a: ["dist/dist.tar.gz"])
+    monkeypatch.setattr(commands, "_find_dists", lambda a: ["dist/dist.tar.gz"])
     monkeypatch.setattr(
-        check, "PackageFile", pretend.stub(from_filename=lambda *a, **kw: package),
+        package_file,
+        "PackageFile",
+        pretend.stub(from_filename=lambda *a, **kw: package),
     )
     monkeypatch.setattr(check, "_WarningStream", lambda: warning_stream)
 

tests/test_cli.py

@@ -14,13 +14,13 @@
 import pretend
 import pytest
 
-import twine.commands.upload
 from twine import cli
+from twine.commands import upload
 
 
 def test_dispatch_to_subcommand(monkeypatch):
     replaced_main = pretend.call_recorder(lambda args: None)
-    monkeypatch.setattr(twine.commands.upload, "main", replaced_main)
+    monkeypatch.setattr(upload, "main", replaced_main)
 
     cli.dispatch(["upload", "path/to/file"])
 

tests/test_commands.py

@@ -2,12 +2,12 @@
 
 import pytest
 
+from twine import commands
 from twine import exceptions
-from twine.commands import _find_dists, _group_wheel_files_first
 
 
 def test_ensure_wheel_files_uploaded_first():
-    files = _group_wheel_files_first(
+    files = commands._group_wheel_files_first(
         ["twine/foo.py", "twine/first.whl", "twine/bar.py", "twine/second.whl"]
     )
     expected = [
@@ -20,13 +20,13 @@ def test_ensure_wheel_files_uploaded_first():
 
 
 def test_ensure_if_no_wheel_files():
-    files = _group_wheel_files_first(["twine/foo.py", "twine/bar.py"])
+    files = commands._group_wheel_files_first(["twine/foo.py", "twine/bar.py"])
     expected = ["twine/foo.py", "twine/bar.py"]
     assert expected == files
 
 
 def test_find_dists_expands_globs():
-    files = sorted(_find_dists(["twine/__*.py"]))
+    files = sorted(commands._find_dists(["twine/__*.py"]))
     expected = [
         os.path.join("twine", "__init__.py"),
         os.path.join("twine", "__main__.py"),
@@ -36,7 +36,7 @@ def test_find_dists_expands_globs():
 
 def test_find_dists_errors_on_invalid_globs():
     with pytest.raises(exceptions.InvalidDistribution):
-        _find_dists(["twine/*.rb"])
+        commands._find_dists(["twine/*.rb"])
 
 
 def test_find_dists_handles_real_files():
@@ -47,5 +47,5 @@ def test_find_dists_handles_real_files():
         "twine/utils.py",
         "twine/wheel.py",
     ]
-    files = _find_dists(expected)
+    files = commands._find_dists(expected)
     assert expected == files

tests/test_integration.py

@@ -1,4 +1,4 @@
-from twine.cli import dispatch
+from twine import cli
 
 
 def test_devpi_upload(devpi_server, uploadable_dist):
@@ -12,7 +12,7 @@ def test_devpi_upload(devpi_server, uploadable_dist):
         devpi_server.password,
         str(uploadable_dist),
     ]
-    dispatch(command)
+    cli.dispatch(command)
 
 
 twine_sampleproject_token = (
@@ -35,7 +35,7 @@ def test_pypi_upload(sampleproject_dist):
         twine_sampleproject_token,
         str(sampleproject_dist),
     ]
-    dispatch(command)
+    cli.dispatch(command)
 
 
 def test_pypiserver_upload(pypiserver_instance, uploadable_dist):
@@ -49,4 +49,4 @@ def test_pypiserver_upload(pypiserver_instance, uploadable_dist):
         "any",
         str(uploadable_dist),
     ]
-    dispatch(command)
+    cli.dispatch(command)

tests/test_main.py

@@ -13,10 +13,11 @@
 import pretend
 
 from twine import __main__ as dunder_main
+from twine import cli
 from twine import exceptions
 
 
 def test_exception_handling(monkeypatch):
     replaced_dispatch = pretend.raiser(exceptions.InvalidConfiguration("foo"))
-    monkeypatch.setattr(dunder_main, "dispatch", replaced_dispatch)
+    monkeypatch.setattr(cli, "dispatch", replaced_dispatch)
     assert dunder_main.main() == "InvalidConfiguration: foo"