From 9cea6210bbb0efc82402f83e7f6edf359066580b Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Wed, 31 Oct 2012 10:45:36 -0400
Subject: [PATCH] refactored __get_airtime_version
---
python_apps/api_clients/api_client.py | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index db27aba3c..19484fd14 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -180,23 +180,8 @@ class AirtimeApiClient(object):
def __get_airtime_version(self):
# TODO : maybe fix this function to drop an exception?
- logger = self.logger
- url= self.construct_url("version_url")
-
- logger.debug("Trying to contact %s", url)
-
- version = -1
- try:
- data = self.get_response_from_server(url)
- logger.debug("Data: %s", data)
- response_json = json.loads(data)
- version = response_json['version']
- logger.debug("Airtime Version %s detected", version)
- except Exception, e:
- logger.error("Unable to detect Airtime Version - %s", e)
- return -1
-
- return version
+ try: return self.services.version_url()
+ except Exception: return -1
def is_server_compatible(self, verbose=True):
logger = self.logger