Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas

This commit is contained in:
Rudi Grinberg 2012-11-07 12:05:37 -05:00
commit cd6c305b81
3 changed files with 4 additions and 3 deletions

View file

@ -159,12 +159,13 @@ class AirtimeApiClient(object):
def __get_airtime_version(self):
# TODO : maybe fix this function to drop an exception?
try: return self.services.version_url()
try: return self.services.version_url()[u'version']
except Exception: return -1
def is_server_compatible(self, verbose=True):
logger = self.logger
version = self.__get_airtime_version()
# logger.info('Airtime version found: ' + str(version))
if (version == -1):
if (verbose):
logger.info('Unable to get Airtime version number.\n')