Use UserAgentBuilder from requests-toolbelt

sigmavirus24 · sigmavirus24 · commit 62f1b1928e3c · 2017-05-20T16:52:16.000-05:00
Generate our User-Agent string without including kernel information. Closes pypa#229
diff --git a/twine/repository.py b/twine/repository.py
@@ -22,7 +22,7 @@
 from requests_toolbelt.multipart import (
     MultipartEncoder, MultipartEncoderMonitor
 )
-from requests_toolbelt.utils.user_agent import user_agent
+from requests_toolbelt.utils import user_agent
 
 import twine
 
@@ -68,7 +68,11 @@ def _make_adapter_with_retries():
     def _make_user_agent_string():
         from twine import cli
         dependencies = cli.list_dependencies_and_versions()
-        return user_agent('twine', twine.__version__, extras=dependencies)
+        return user_agent.UserAgentBuilder(
+                'twine', twine.__version__,
+            ).include_extras(
+                dependencies
+            ).include_implementation().build()
 
     def close(self):
         self.session.close()
