Send the library and python versions in the UA string

skimbrel · skimbrel · commit a20cd26aa18d · 2013-08-12T15:54:42.000-07:00
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -21,9 +21,13 @@ def setUp(self):
     def test_request(self, mock):
         self.client.request("2010-04-01", method="GET")
         mock.assert_called_with("GET", "https://api.twilio.com/2010-04-01",
-                                headers={"User-Agent": 'twilio-python',
+                                headers={"User-Agent": ANY,
                                          'Accept-Charset': 'utf-8'},
                                 params={}, auth=AUTH, data=None)
+        called_kwargs = mock.mock_calls[0][2]
+        self.assertTrue(
+            'twilio-python' in called_kwargs['headers']['User-Agent']
+        )
 
     def test_connect_apps(self):
         self.assertIsInstance(self.client.connect_apps,
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -1,6 +1,8 @@
 import logging
 import os
+import platform
 from twilio import TwilioException
+from twilio import __version__ as LIBRARY_VERSION
 from twilio.rest.resources import make_request
 from twilio.rest.resources import Accounts
 from twilio.rest.resources import Applications
@@ -76,8 +78,13 @@ def request(self, path, method=None, vars=None):
         elif method == "POST" or method == "PUT":
             data = vars
 
+        user_agent = "twilio-python {} (python-{})".format(
+            LIBRARY_VERSION,
+            platform.python_version(),
+        )
+
         headers = {
-            "User-Agent": "twilio-python",
+            "User-Agent": user_agent,
             "Accept-Charset": "utf-8",
         }
 
