Merge pull request pypa#248 from pypa/bug/228

sigmavirus24 · web-flow · commit 758ca6efff91 · 2017-05-20T20:32:08.000-05:00
Rework handling and display of exceptions
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -0,0 +1,21 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 twine import __main__ as dunder_main
+
+import pretend
+
+
+def test_exception_handling(monkeypatch):
+    replaced_dispatch = pretend.raiser(KeyError('foo'))
+    monkeypatch.setattr(dunder_main, 'dispatch', replaced_dispatch)
+    assert dunder_main.main() == 'KeyError: foo'
diff --git a/twine/__main__.py b/twine/__main__.py
@@ -21,7 +21,13 @@
 
 
 def main():
-    return dispatch(sys.argv[1:])
+    try:
+        return dispatch(sys.argv[1:])
+    except Exception as exc:
+        return '{0}: {1}'.format(
+            exc.__class__.__name__,
+            exc.args[0],
+        )
 
 
 if __name__ == "__main__":
diff --git a/twine/commands/register.py b/twine/commands/register.py
@@ -15,7 +15,6 @@
 
 import argparse
 import os.path
-import sys
 
 from twine import exceptions as exc
 from twine.package import PackageFile
@@ -137,7 +136,4 @@ def main(args):
     args = parser.parse_args(args)
 
     # Call the register function with the args from the command line
-    try:
-        register(**vars(args))
-    except Exception as exc:
-        sys.exit("{exc.__class__.__name__}: {exc}".format(exc=exc))
+    register(**vars(args))
diff --git a/twine/commands/upload.py b/twine/commands/upload.py
@@ -251,10 +251,7 @@ def main(args):
     args = parser.parse_args(args)
 
     # Call the upload function with the arguments from the command line
-    try:
-        upload(**vars(args))
-    except Exception as exc:
-        sys.exit("{exc.__class__.__name__}: {exc}".format(exc=exc))
+    upload(**vars(args))
 
 
 if __name__ == "__main__":
