Switch to DigestAuth. This is incompatible with firmware <2.0.4

Author: tback

spx/smartplug.py

@@ -6,6 +6,7 @@
 from xml.dom.minidom import parseString
 
 import requests
+from requests.auth import HTTPDigestAuth
 
 log = logging.getLogger(__name__)
 
@@ -74,7 +75,8 @@ def _convert_to_boolean(self, value):
 
     def _send_command(self, command):
         log.debug(command)
-        response = requests.post(self.url, data=command, auth=HTTPDigestAut h(),timeout=5)
+        auth = HTTPDigestAuth(username=self.username, password=self.password)
+        response = requests.post(self.url, data=command,timeout=5, auth=auth)
 
         if response.status_code != 200:
             raise SmartplugCommandFailed(response.status_code,

spx/tool.py

@@ -1,5 +1,8 @@
 import datetime
 import unittest
+
+from requests.auth import HTTPBasicAuth
+
 try:
     from mock import MagicMock, patch
 except ImportError:
@@ -30,9 +33,10 @@ def test_get_usage(self, p, d):
             }
         )
         p.assert_called_once_with(
-            'http://admin:1234@240.0.0.1:10000/smartplug.cgi',
+            'http://240.0.0.1:10000/smartplug.cgi',
             data='\n<?xml version="1.0" encoding="UTF8"?>\n<SMARTPLUG id="edimax">\n<CMD id="get">\n    <NOW_POWER>\n    </NOW_POWER>\n</CMD>\n</SMARTPLUG>',
-            timeout=5
+            timeout=5,
+            auth=HTTPBasicAuth('admin', '1234')
         )