From: Thierry Parmentelat Date: Fri, 20 Jan 2012 09:36:24 +0000 (+0100) Subject: symbols starting with __ are reserved X-Git-Tag: before-migrate~12 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c30548655b9cfdda065a8aaab659f0e3fb50d42;p=sfa.git symbols starting with __ are reserved --- diff --git a/sfa/importer/sfaImport.py b/sfa/importer/sfaImport.py index 7e649d00..e54bec79 100644 --- a/sfa/importer/sfaImport.py +++ b/sfa/importer/sfaImport.py @@ -67,7 +67,7 @@ class sfaImport: # create interface records self.logger.info("Import: creating interface records") # xxx authority+ turning off the creation of authority+* -# in fact his is required - used in SfaApi.__getCredentialRaw +# in fact his is required - used in SfaApi._getCredentialRaw # that tries to locate 'authority+sa' self.create_interface_records() diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py index 3f6bea78..f24c5701 100644 --- a/sfa/server/sfaapi.py +++ b/sfa/server/sfaapi.py @@ -109,9 +109,9 @@ class SfaApi (XmlrpcApi): # get a new credential if self.interface in ['registry']: - cred = self.__getCredentialRaw() + cred = self._getCredentialRaw() else: - cred = self.__getCredential() + cred = self._getCredential() cred.save_to_file(cred_filename, save_parents=True) return cred.save_to_string(save_parents=True) @@ -134,7 +134,7 @@ class SfaApi (XmlrpcApi): break return delegated_cred - def __getCredential(self): + def _getCredential(self): """ Get our credential from a remote registry """ @@ -148,7 +148,7 @@ class SfaApi (XmlrpcApi): cred = registry.GetCredential(self_cred, self.hrn, 'authority') return Credential(string=cred) - def __getCredentialRaw(self): + def _getCredentialRaw(self): """ Get our current credential directly from the local registry. """