X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Funtangle%2Funtangle.py;h=c66cd67b45dbbe56c67d3ed8d1654d2e7cb7f5fd;hb=b5f616878bac3673de90e9c47bf8dedbae790dfd;hp=39eeeaa6abb3dc200eb1128998fee8bd97d30fe0;hpb=d5116761228e2765fd720e67517ec51e2873a61f;p=untangle-https-backup.git

diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py
index 39eeeaa..c66cd67 100644
--- a/src/untangle/untangle.py
+++ b/src/untangle/untangle.py
@@ -22,7 +22,7 @@ class Untangle:
         self.base_url = 'https://' + self.host + '/' # This never changes
 
         # Sanity check the numerical version.
-        if self.version not in [9, 11, 12]:
+        if self.version not in [9, 10, 11, 12]:
             msg =  'Invalid version "' + str(self.version) + '" '
             msg += 'in section "' + s.name + '"'
             raise configparser.ParsingError(msg)
@@ -38,7 +38,6 @@ class Untangle:
             msg += 'in section "' + s.name + '"'
             raise configparser.ParsingError(msg)
 
-        #
         # Finally, create a URL opener to make HTTPS requests.
         #
         # First, create a cookie jar that we'll attach to our URL
@@ -79,11 +78,9 @@ class Untangle:
         """
         if self.version == 9:
             return self.get_backup_v9()
-        elif self.version == 11:
-            return self.get_backup_v11()
-        elif self.version == 12:
-            # The procedure for v12 is the same as for v11.
-            return self.get_backup_v11()
+        elif self.version in [10, 11, 12]:
+            # The procedure for v11 or v12 is the same as for v10.
+            return self.get_backup_v10()
 
 
     def get_backup_v9(self):
@@ -104,13 +101,13 @@ class Untangle:
             return response.read()
 
 
-    def get_backup_v11(self):
+    def get_backup_v10(self):
         """
-        Retrieve a backup from Untangle version 11.
+        Retrieve a backup from Untangle version 10.
 
         Returns the binary HTTPS response (i.e. the file).
         """
-        url = self.base_url + '/webui/download?type=backup'
+        url = self.base_url + '/webui/download'
         post_vars = {'type': 'backup'}
         post_data = urllib.parse.urlencode(post_vars).encode('ascii')
         with self.opener.open(url, post_data) as response: