Merge pull request #1 from voice1/master

Added authentication method check

Author: matt-jordan

pyswitchvox/client.py

@@ -65,9 +65,23 @@ def __init__(self, address, username, password, timeout=30):
 
         self._address = address
         self._session = requests.Session()
-        self._session.auth = HTTPDigestAuth(username, password)
+        self._session.auth = self._detect_auth(username, password, address)
         self.timeout = timeout
 
+    def _detect_auth(self, username, password, hostname):
+        """Switchvox 6.6.0.x changed authentication methods.                
+        Returns the request auth object. 
+        """
+        auth = HTTPDigestAuth(username, password)
+
+        r = self._session.post("https://" + hostname + "/json", 
+                               json={}, 
+                               auth=auth, 
+                               verify=False)
+        if r.status_code == 401:
+            auth = requests.auth.HTTPBasicAuth(username, password)
+        return auth
+    
     def close(self):
         """Close the client connection
         """

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="pyswitchvox",
-    version="0.0.1",
+    version="0.0.2",
     license="BSD 3-Clause License",
     description="Library for accessing the Switchvox Extend API",
     long_description=open(os.path.join(os.path.dirname(__file__),