X-Git-Url: http://gitweb.michael.orlitzky.com/?p=untangle-https-backup.git;a=blobdiff_plain;f=src%2Funtangle%2Funtangle.py;h=31ab60e4d7a9f4291edfca8ec8f987c160fb9273;hp=39eeeaa6abb3dc200eb1128998fee8bd97d30fe0;hb=31baaa4a8ec5545be073bc6fc8ff3dd7a49d9707;hpb=d5116761228e2765fd720e67517ec51e2873a61f diff --git a/src/untangle/untangle.py b/src/untangle/untangle.py index 39eeeaa..31ab60e 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,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). """