Rearrange a comment.

[untangle-https-backup.git] / src / untangle / untangle.py

diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py
index 6a972804f0fe0a1afe0523a108b2c4ecce009b7e..31ab60e4d7a9f4291edfca8ec8f987c160fb9273 100644 (file)
--- a/src/untangle/untangle.py
+++ b/src/untangle/untangle.py
@@ -18,11 +18,11 @@ class Untangle:
         self.host = s['host']
         self.username = s.get('username', 'admin')
         self.password = s['password']
-        self.version = int(s.get('version', '11'))
+        self.version = int(s.get('version', '12'))
         self.base_url = 'https://' + self.host + '/' # This never changes
 
         # Sanity check the numerical version.
-        if self.version not in [9, 11]:
+        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,8 +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 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):
@@ -101,9 +101,9 @@ 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).
         """