Merge remote-tracking branch 'kali/bug/allow-absolute-paths2' into develop

17 files changed, 506 insertions, 496 deletions

diff --git a/changes/bug_allow-absolute-paths b/changes/bug_allow-absolute-paths
new file mode 100644
index 0000000..deaff1f
--- /dev/null
+++ b/changes/bug_allow-absolute-paths
@@ -0,0 +1 @@
+  o Allow absolute paths in baseconfig.load
diff --git a/src/leap/common/certs.py b/src/leap/common/certs.py
index 4cb70dd..4fe563b 100644
--- a/src/leap/common/certs.py
+++ b/src/leap/common/certs.py
@@ -35,10 +35,10 @@ def get_cert_from_string(string):
     """
     Returns the x509 from the contents of this string
 
-    @param string: certificate contents as downloaded
-    @type string: str
+    :param string: certificate contents as downloaded
+    :type string: str
 
-    @return: x509 or None
+    :return: x509 or None
     """
     leap_assert(string, "We need something to load")
 
@@ -55,10 +55,10 @@ def get_privatekey_from_string(string):
     """
     Returns the private key from the contents of this string
 
-    @param string: private key contents as downloaded
-    @type string: str
+    :param string: private key contents as downloaded
+    :type string: str
 
-    @return: private key or None
+    :return: private key or None
     """
     leap_assert(string, "We need something to load")
 
@@ -75,12 +75,12 @@ def get_digest(cert_data, method):
     """
     Returns the digest for the cert_data using the method specified
 
-    @param cert_data: certificate data in string form
-    @type cert_data: str
-    @param method: method to be used for digest
-    @type method: str
+    :param cert_data: certificate data in string form
+    :type cert_data: str
+    :param method: method to be used for digest
+    :type method: str
 
-    @rtype: str
+    :rtype: str
     """
     x509 = get_cert_from_string(cert_data)
     digest = x509.digest(method).replace(":", "").lower()
@@ -93,10 +93,10 @@ def can_load_cert_and_pkey(string):
     Loads certificate and private key from a buffer, returns True if
     everything went well, False otherwise
 
-    @param string: buffer containing the cert and private key
-    @type string: str or any kind of buffer
+    :param string: buffer containing the cert and private key
+    :type string: str or any kind of buffer
 
-    @rtype: bool
+    :rtype: bool
     """
     can_load = True
 
@@ -118,10 +118,10 @@ def is_valid_pemfile(cert):
     """
     Checks that the passed string is a valid pem certificate
 
-    @param cert: String containing pem content
-    @type cert: str
+    :param cert: String containing pem content
+    :type cert: str
 
-    @rtype: bool
+    :rtype: bool
     """
     leap_assert(cert, "We need a cert to load")
 
@@ -132,10 +132,10 @@ def get_cert_time_boundaries(certfile):
     """
     Returns the time boundaries for the certificate saved in certfile
 
-    @param certfile: path to certificate
-    @type certfile: str
+    :param certfile: path to certificate
+    :type certfile: str
 
-    @rtype: tuple (from, to)
+    :rtype: tuple (from, to)
     """
     cert = get_cert_from_string(certfile)
     leap_assert(cert, 'There was a problem loading the certificate')
@@ -151,11 +151,11 @@ def should_redownload(certfile, now=time.gmtime):
     """
     Returns True if any of the checks don't pass, False otherwise
 
-    @param certfile: path to certificate
-    @type certfile: str
-    @param now: current date function, ONLY USED FOR TESTING
+    :param certfile: path to certificate
+    :type certfile: str
+    :param now: current date function, ONLY USED FOR TESTING
 
-    @rtype: bool
+    :rtype: bool
     """
     exists = os.path.isfile(certfile)
 
diff --git a/src/leap/common/check.py b/src/leap/common/check.py
index 359673b..a2d39a6 100644
--- a/src/leap/common/check.py
+++ b/src/leap/common/check.py
@@ -31,10 +31,10 @@ def leap_assert(condition, message=""):
     Asserts the condition and displays the message if that's not
     met. It also logs the error and its backtrace.
 
-    @param condition: condition to check
-    @type condition: bool
-    @param message: message to display if the condition isn't met
-    @type message: str
+    :param condition: condition to check
+    :type condition: bool
+    :param message: message to display if the condition isn't met
+    :type message: str
     """
     if not condition:
         logger.error("Bug: %s" % (message,))
@@ -51,10 +51,10 @@ def leap_assert_type(var, expectedType):
     """
     Helper assert check for a variable's expected type
 
-    @param var: variable to check
-    @type var: any
-    @param expectedType: type to check agains
-    @type expectedType: type
+    :param var: variable to check
+    :type var: any
+    :param expectedType: type to check agains
+    :type expectedType: type
     """
     leap_assert(isinstance(var, expectedType),
                 "Expected type %r instead of %r" %
diff --git a/src/leap/common/config/baseconfig.py b/src/leap/common/config/baseconfig.py
index 146f1e4..e6bd9c4 100644
--- a/src/leap/common/config/baseconfig.py
+++ b/src/leap/common/config/baseconfig.py
@@ -36,18 +36,19 @@ logger = logging.getLogger(__name__)
 
 class BaseConfig:
     """
-    Abstract base class for any JSON based configuration
+    Abstract base class for any JSON based configuration.
     """
 
     __metaclass__ = ABCMeta
 
     """
-    Standalone is a class wide parameter
+    Standalone is a class wide parameter.
 
-    @param standalone: if True it will return the prefix for a
-    standalone application. Otherwise, it will return the system
-    default for configuration storage.
-    @type standalone: bool
+    :param standalone: if True it will return the prefix for a
+                       standalone application. Otherwise, it will
+                       return the system
+                       default for configuration storage.
+    :type standalone: bool
     """
     standalone = False
 
@@ -58,16 +59,16 @@ class BaseConfig:
     @abstractmethod
     def _get_spec(self):
         """
-        Returns the spec object for the specific configuration
+        Returns the spec object for the specific configuration.
         """
         return None
 
     def _safe_get_value(self, key):
         """
-        Tries to return a value only if the config has already been loaded
+        Tries to return a value only if the config has already been loaded.
 
-        @rtype: depends on the config structure, dict, str, array, int
-        @return: returns the value for the specified key in the config
+        :rtype: depends on the config structure, dict, str, array, int
+        :return: returns the value for the specified key in the config
         """
         leap_assert(self._config_checker, "Load the config first")
         return self._config_checker.config.get(key, None)
@@ -88,14 +89,14 @@ class BaseConfig:
 
     def save(self, path_list):
         """
-        Saves the current configuration to disk
+        Saves the current configuration to disk.
 
-        @param path_list: list of components that form the relative
-        path to configuration. The absolute path will be calculated
-        depending on the platform.
-        @type path_list: list
+        :param path_list: list of components that form the relative
+                          path to configuration. The absolute path
+                          will be calculated depending on the platform.
+        :type path_list: list
 
-        @return: True if saved to disk correctly, False otherwise
+        :return: True if saved to disk correctly, False otherwise
         """
         config_path = os.path.join(self.get_path_prefix(), *(path_list[:-1]))
         mkdir_p(config_path)
@@ -108,19 +109,27 @@ class BaseConfig:
             raise
         return True
 
-    def load(self, path="", data=None, mtime=None):
+    def load(self, path="", data=None, mtime=None, relative=True):
         """
-        Loads the configuration from disk
+        Loads the configuration from disk.
 
-        @type path: str
-        @param path: relative path to configuration. The absolute path
-        will be calculated depending on the platform
+        :param path: if relative=True, this is a relative path
+                     to configuration. The absolute path
+                     will be calculated depending on the platform
+        :type path: str
 
-        @return: True if loaded from disk correctly, False otherwise
+        :param relative: if True, path is relative. If False, it's absolute.
+        :type relative: bool
+
+        :return: True if loaded from disk correctly, False otherwise
+        :rtype: bool
         """
 
-        config_path = os.path.join(self.get_path_prefix(),
-                                   path)
+        if relative is True:
+            config_path = os.path.join(
+                self.get_path_prefix(), path)
+        else:
+            config_path = path
 
         self._config_checker = PluggableConfig(format="json")
         self._config_checker.options = copy.deepcopy(self._get_spec())
@@ -131,8 +140,8 @@ class BaseConfig:
             else:
                 self._config_checker.load(data, mtime=mtime)
         except Exception as e:
-            logger.warning("Something went wrong while loading " +
-                           "the config from %s\n%s" % (config_path, e))
+            logger.error("Something went wrong while loading " +
+                         "the config from %s\n%s" % (config_path, e))
             self._config_checker = None
             return False
         return True
@@ -140,7 +149,7 @@ class BaseConfig:
 
 class LocalizedKey(object):
     """
-    Decorator used for keys that are localized in a configuration
+    Decorator used for keys that are localized in a configuration.
     """
 
     def __init__(self, func, **kwargs):
@@ -149,13 +158,13 @@ class LocalizedKey(object):
     def __call__(self, instance, lang="en"):
         """
         Tries to return the string for the specified language, otherwise
-        informs the problem and returns an empty string
+        informs the problem and returns an empty string.
 
-        @param lang: language code
-        @type lang: str
+        :param lang: language code
+        :type lang: str
 
-        @return: localized value from the possible values returned by
-        self._func
+        :return: localized value from the possible values returned by
+                 self._func
         """
         descriptions = self._func(instance)
         description_lang = ""
diff --git a/src/leap/common/config/prefixers.py b/src/leap/common/config/prefixers.py
index 27274bd..050d4cd 100644
--- a/src/leap/common/config/prefixers.py
+++ b/src/leap/common/config/prefixers.py
@@ -39,10 +39,10 @@ class Prefixer:
         """
         Returns the platform dependant path prefixer
 
-        @param standalone: if True it will return the prefix for a
+        :param standalone: if True it will return the prefix for a
         standalone application. Otherwise, it will return the system
         default for configuration storage.
-        @type standalone: bool
+        :type standalone: bool
         """
         return ""
 
@@ -65,10 +65,10 @@ class LinuxPrefixer(Prefixer):
         This method expects an env variable named LEAP_CLIENT_PATH if
         standalone is used.
 
-        @param standalone: if True it will return the prefix for a
+        :param standalone: if True it will return the prefix for a
         standalone application. Otherwise, it will return the system
         default for configuration storage.
-        @type standalone: bool
+        :type standalone: bool
         """
         config_dir = BaseDirectory.xdg_config_home
         if not standalone:
@@ -87,10 +87,10 @@ class DarwinPrefixer(Prefixer):
         This method expects an env variable named LEAP_CLIENT_PATH if
         standalone is used.
 
-        @param standalone: if True it will return the prefix for a
+        :param standalone: if True it will return the prefix for a
         standalone application. Otherwise, it will return the system
         default for configuration storage.
-        @type standalone: bool
+        :type standalone: bool
         """
         config_dir = BaseDirectory.xdg_config_home
         if not standalone:
@@ -109,10 +109,10 @@ class WindowsPrefixer(Prefixer):
         This method expects an env variable named LEAP_CLIENT_PATH if
         standalone is used.
 
-        @param standalone: if True it will return the prefix for a
+        :param standalone: if True it will return the prefix for a
         standalone application. Otherwise, it will return the system
         default for configuration storage.
-        @type standalone: bool
+        :type standalone: bool
         """
         config_dir = BaseDirectory.xdg_config_home
 
diff --git a/src/leap/common/crypto.py b/src/leap/common/crypto.py
index 3d6030b..7f80a8a 100644
--- a/src/leap/common/crypto.py
+++ b/src/leap/common/crypto.py
@@ -53,15 +53,15 @@ def encrypt_sym(data, key, method=EncryptionMethods.AES_256_CTR):
     """
     Encrypt C{data} with C{key}, using C{method} encryption method.
 
-    @param data: The data to be encrypted.
-    @type data: str
-    @param key: The key used to encrypt C{data} (must be 256 bits long).
-    @type key: str
-    @param method: The encryption method to use.
-    @type method: str
-
-    @return: A tuple with the initial value and the encrypted data.
-    @rtype: (long, str)
+    :param data: The data to be encrypted.
+    :type data: str
+    :param key: The key used to encrypt C{data} (must be 256 bits long).
+    :type key: str
+    :param method: The encryption method to use.
+    :type method: str
+
+    :return: A tuple with the initial value and the encrypted data.
+    :rtype: (long, str)
     """
     leap_assert_type(key, str)
 
@@ -83,17 +83,17 @@ def decrypt_sym(data, key, method=EncryptionMethods.AES_256_CTR, **kwargs):
     """
     Decrypt C{data} with C{key} using C{method} encryption method.
 
-    @param data: The data to be decrypted.
-    @type data: str
-    @param key: The key used to decrypt C{data} (must be 256 bits long).
-    @type key: str
-    @param method: The encryption method to use.
-    @type method: str
-    @param kwargs: Other parameters specific to each encryption method.
-    @type kwargs: dict
-
-    @return: The decrypted data.
-    @rtype: str
+    :param data: The data to be decrypted.
+    :type data: str
+    :param key: The key used to decrypt C{data} (must be 256 bits long).
+    :type key: str
+    :param method: The encryption method to use.
+    :type method: str
+    :param kwargs: Other parameters specific to each encryption method.
+    :type kwargs: dict
+
+    :return: The decrypted data.
+    :rtype: str
     """
     leap_assert_type(key, str)
 
diff --git a/src/leap/common/events/__init__.py b/src/leap/common/events/__init__.py
index c949080..9fc93ee 100644
--- a/src/leap/common/events/__init__.py
+++ b/src/leap/common/events/__init__.py
@@ -45,24 +45,24 @@ def register(signal, callback, uid=None, replace=False, reqcbk=None,
     returned for a synch request but nothing will be returned for an asynch
     request.
 
-    @param signal: the signal that causes the callback to be launched
-    @type signal: int (see the `events.proto` file)
-    @param callback: the callback to be called when the signal is received
-    @type callback: function
-    @param uid: a unique id for the callback
-    @type uid: int
-    @param replace: should an existent callback with same uid be replaced?
-    @type replace: bool
-    @param reqcbk: a callback to be called when a response from server is
+    :param signal: the signal that causes the callback to be launched
+    :type signal: int (see the `events.proto` file)
+    :param callback: the callback to be called when the signal is received
+    :type callback: function
+    :param uid: a unique id for the callback
+    :type uid: int
+    :param replace: should an existent callback with same uid be replaced?
+    :type replace: bool
+    :param reqcbk: a callback to be called when a response from server is
         received
-    @type reqcbk: function
+    :type reqcbk: function
         callback(leap.common.events.events_pb2.EventResponse)
-    @param timeout: the timeout for synch calls
-    @type timeout: int
+    :param timeout: the timeout for synch calls
+    :type timeout: int
 
-    @return: the response from server for synch calls or nothing for asynch
+    :return: the response from server for synch calls or nothing for asynch
         calls
-    @rtype: leap.common.events.events_pb2.EventsResponse or None
+    :rtype: leap.common.events.events_pb2.EventsResponse or None
     """
     return component.register(signal, callback, uid, replace, reqcbk, timeout)
 
@@ -78,23 +78,23 @@ def signal(signal, content="", mac_method="", mac="", reqcbk=None,
     returned for a synch request but nothing will be returned for an asynch
     request.
 
-    @param signal: the signal that causes the callback to be launched
-    @type signal: int (see the `events.proto` file)
-    @param content: the contents of the event signal
-    @type content: str
-    @param mac_method: the method used to auth mac
-    @type mac_method: str
-    @param mac: the content of the auth mac
-    @type mac: str
-    @param reqcbk: a callback to be called when a response from server is
+    :param signal: the signal that causes the callback to be launched
+    :type signal: int (see the `events.proto` file)
+    :param content: the contents of the event signal
+    :type content: str
+    :param mac_method: the method used to auth mac
+    :type mac_method: str
+    :param mac: the content of the auth mac
+    :type mac: str
+    :param reqcbk: a callback to be called when a response from server is
         received
-    @type reqcbk: function
+    :type reqcbk: function
         callback(leap.common.events.events_pb2.EventResponse)
-    @param timeout: the timeout for synch calls
-    @type timeout: int
+    :param timeout: the timeout for synch calls
+    :type timeout: int
 
-    @return: the response from server for synch calls or nothing for asynch
+    :return: the response from server for synch calls or nothing for asynch
         calls
-    @rtype: leap.common.events.events_pb2.EventsResponse or None
+    :rtype: leap.common.events.events_pb2.EventsResponse or None
     """
     return component.signal(signal, content, mac_method, mac, reqcbk, timeout)
diff --git a/src/leap/common/events/component.py b/src/leap/common/events/component.py
index f62f948..9932190 100644
--- a/src/leap/common/events/component.py
+++ b/src/leap/common/events/component.py
@@ -63,8 +63,8 @@ def ensure_component_daemon():
     Ensure the component daemon is running and listening for incoming
     messages.
 
-    @return: the daemon instance
-    @rtype: EventsComponentDaemon
+    :return: the daemon instance
+    :rtype: EventsComponentDaemon
     """
     import time
     daemon = EventsComponentDaemon.ensure(0)
@@ -91,28 +91,28 @@ def register(signal, callback, uid=None, replace=False, reqcbk=None,
     returned for a synch request but nothing will be returned for an asynch
     request.
 
-    @param signal: the signal that causes the callback to be launched
-    @type signal: int (see the `events.proto` file)
-    @param callback: the callback to be called when the signal is received
-    @type callback: function
+    :param signal: the signal that causes the callback to be launched
+    :type signal: int (see the `events.proto` file)
+    :param callback: the callback to be called when the signal is received
+    :type callback: function
         callback(leap.common.events.events_pb2.SignalRequest)
-    @param uid: a unique id for the callback
-    @type uid: int
-    @param replace: should an existent callback with same uid be replaced?
-    @type replace: bool
-    @param reqcbk: a callback to be called when a response from server is
+    :param uid: a unique id for the callback
+    :type uid: int
+    :param replace: should an existent callback with same uid be replaced?
+    :type replace: bool
+    :param reqcbk: a callback to be called when a response from server is
         received
-    @type reqcbk: function
+    :type reqcbk: function
         callback(leap.common.events.events_pb2.EventResponse)
-    @param timeout: the timeout for synch calls
-    @type timeout: int
+    :param timeout: the timeout for synch calls
+    :type timeout: int
 
     Might raise a CallbackAlreadyRegistered exception if there's already a
     callback identified by the given uid and replace is False.
 
-    @return: the response from server for synch calls or nothing for asynch
+    :return: the response from server for synch calls or nothing for asynch
         calls
-    @rtype: leap.common.events.events_pb2.EventsResponse or None
+    :rtype: leap.common.events.events_pb2.EventsResponse or None
     """
     ensure_component_daemon()  # so we can receive registered signals
     # register callback locally
@@ -152,24 +152,24 @@ def signal(signal, content="", mac_method="", mac="", reqcbk=None,
     returned for a synch request but nothing will be returned for an asynch
     request.
 
-    @param signal: the signal that causes the callback to be launched
-    @type signal: int (see the `events.proto` file)
-    @param content: the contents of the event signal
-    @type content: str
-    @param mac_method: the method used for auth mac
-    @type mac_method: str
-    @param mac: the content of the auth mac
-    @type mac: str
-    @param reqcbk: a callback to be called when a response from server is
+    :param signal: the signal that causes the callback to be launched
+    :type signal: int (see the `events.proto` file)
+    :param content: the contents of the event signal
+    :type content: str
+    :param mac_method: the method used for auth mac
+    :type mac_method: str
+    :param mac: the content of the auth mac
+    :type mac: str
+    :param reqcbk: a callback to be called when a response from server is
         received
-    @type reqcbk: function
+    :type reqcbk: function
         callback(leap.common.events.events_pb2.EventResponse)
-    @param timeout: the timeout for synch calls
-    @type timeout: int
+    :param timeout: the timeout for synch calls
+    :type timeout: int
 
-    @return: the response from server for synch calls or nothing for asynch
+    :return: the response from server for synch calls or nothing for asynch
         calls
-    @rtype: leap.common.events.events_pb2.EventsResponse or None
+    :rtype: leap.common.events.events_pb2.EventsResponse or None
     """
     request = proto.SignalRequest()
     request.event = signal
@@ -197,12 +197,12 @@ class EventsComponentService(proto.EventsComponentService):
         This method is called whenever a signal request is received from
         server.
 
-        @param controller: used to mediate a single method call
-        @type controller: protobuf.socketrpc.controller.SocketRpcController
-        @param request: the request received from the component
-        @type request: leap.common.events.events_pb2.SignalRequest
-        @param done: callback to be called when done
-        @type done: protobuf.socketrpc.server.Callback
+        :param controller: used to mediate a single method call
+        :type controller: protobuf.socketrpc.controller.SocketRpcController
+        :param request: the request received from the component
+        :type request: leap.common.events.events_pb2.SignalRequest
+        :param done: callback to be called when done
+        :type done: protobuf.socketrpc.server.Callback
         """
         logger.info('Received signal from server: %s...' % str(request)[:40])
 
@@ -230,10 +230,10 @@ class EventsComponentDaemon(daemon.EventsSingletonDaemon):
         """
         Make sure the daemon is running on the given port.
 
-        @param port: the port in which the daemon should listen
-        @type port: int
+        :param port: the port in which the daemon should listen
+        :type port: int
 
-        @return: a daemon instance
-        @rtype: EventsComponentDaemon
+        :return: a daemon instance
+        :rtype: EventsComponentDaemon
         """
         return cls.ensure_service(port, EventsComponentService())
diff --git a/src/leap/common/events/daemon.py b/src/leap/common/events/daemon.py
index d2c7b9b..c253948 100644
--- a/src/leap/common/events/daemon.py
+++ b/src/leap/common/events/daemon.py
@@ -50,10 +50,10 @@ class EventsRpcServer(SocketRpcServer):
         """
         Initialize a RPC server.
 
-        @param port: the port in which to listen for incoming messages
-        @type port: int
-        @param host: the address to bind to
-        @type host: str
+        :param port: the port in which to listen for incoming messages
+        :type port: int
+        :param host: the address to bind to
+        :type host: str
         """
         SocketRpcServer.__init__(self, port, host)
         self._server = None
@@ -111,10 +111,10 @@ class EventsSingletonDaemon(threading.Thread):
         This is a static method disguised as instance method that actually
         does the initialization of the daemon instance.
 
-        @param port: the port in which to listen for incoming messages
-        @type port: int
-        @param service: the service to provide in this daemon
-        @type service: google.protobuf.service.Service
+        :param port: the port in which to listen for incoming messages
+        :type port: int
+        :param service: the service to provide in this daemon
+        :type service: google.protobuf.service.Service
         """
         threading.Thread.__init__(self)
         self._port = port
@@ -141,11 +141,11 @@ class EventsSingletonDaemon(threading.Thread):
         with the appropriate service from the `events.proto` definitions, and
         return the daemon instance.
 
-        @param port: the port in which the daemon should be listening
-        @type port: int
+        :param port: the port in which the daemon should be listening
+        :type port: int
 
-        @return: a daemon instance
-        @rtype: EventsSingletonDaemon
+        :return: a daemon instance
+        :rtype: EventsSingletonDaemon
         """
         raise NotImplementedError(self.ensure)
 
@@ -156,11 +156,11 @@ class EventsSingletonDaemon(threading.Thread):
 
         Might return ServiceAlreadyRunningException
 
-        @param port: the port in which the daemon should be listening
-        @type port: int
+        :param port: the port in which the daemon should be listening
+        :type port: int
 
-        @return: a daemon instance
-        @rtype: EventsSingletonDaemon
+        :return: a daemon instance
+        :rtype: EventsSingletonDaemon
         """
         daemon = cls(port, service)
         if not daemon.is_alive():
@@ -178,8 +178,8 @@ class EventsSingletonDaemon(threading.Thread):
         """
         Retrieve singleton instance of this daemon.
 
-        @return: a daemon instance
-        @rtype: EventsSingletonDaemon
+        :return: a daemon instance
+        :rtype: EventsSingletonDaemon
         """
         return cls.__instance
 
@@ -200,8 +200,8 @@ class EventsSingletonDaemon(threading.Thread):
         Retrieve the value of the port to which the service running in this
         daemon is binded to.
 
-        @return: the port to which the daemon is binded to
-        @rtype: int
+        :return: the port to which the daemon is binded to
+        :rtype: int
         """
         if self._port is 0:
             self._port = self._server.port
diff --git a/src/leap/common/events/server.py b/src/leap/common/events/server.py
index 34c573a..1f3a874 100644
--- a/src/leap/common/events/server.py
+++ b/src/leap/common/events/server.py
@@ -55,11 +55,11 @@ def ensure_server(port=SERVER_PORT):
     Attempt to connect to given local port. Upon success, assume that the
     events server has already been started. Upon failure, start events server.
 
-    @param port: the port in which server should be listening
-    @type port: int
+    :param port: the port in which server should be listening
+    :type port: int
 
-    @return: the daemon instance or nothing
-    @rtype: EventsServerDaemon or None
+    :return: the daemon instance or nothing
+    :rtype: EventsServerDaemon or None
     """
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -81,12 +81,12 @@ class EventsServerService(proto.EventsServerService):
         """
         Register a component port to be signaled when specific events come in.
 
-        @param controller: used to mediate a single method call
-        @type controller: protobuf.socketrpc.controller.SocketRpcController
-        @param request: the request received from the component
-        @type request: leap.common.events.events_pb2.RegisterRequest
-        @param done: callback to be called when done
-        @type done: protobuf.socketrpc.server.Callback
+        :param controller: used to mediate a single method call
+        :type controller: protobuf.socketrpc.controller.SocketRpcController
+        :param request: the request received from the component
+        :type request: leap.common.events.events_pb2.RegisterRequest
+        :param done: callback to be called when done
+        :type done: protobuf.socketrpc.server.Callback
         """
         logger.info("Received registration request: %s..." % str(request)[:40])
         # add component port to signal list
@@ -105,12 +105,12 @@ class EventsServerService(proto.EventsServerService):
         Perform an RPC call to signal all components registered to receive a
         specific signal.
 
-        @param controller: used to mediate a single method call
-        @type controller: protobuf.socketrpc.controller.SocketRpcController
-        @param request: the request received from the component
-        @type request: leap.common.events.events_pb2.SignalRequest
-        @param done: callback to be called when done
-        @type done: protobuf.socketrpc.server.Callback
+        :param controller: used to mediate a single method call
+        :type controller: protobuf.socketrpc.controller.SocketRpcController
+        :param request: the request received from the component
+        :type request: leap.common.events.events_pb2.SignalRequest
+        :param done: callback to be called when done
+        :type done: protobuf.socketrpc.server.Callback
         """
         logger.info('Received signal from component: %s...', str(request)[:40])
         # send signal to all registered components
@@ -140,10 +140,10 @@ class EventsServerDaemon(daemon.EventsSingletonDaemon):
         """
         Make sure the daemon is running on the given port.
 
-        @param port: the port in which the daemon should listen
-        @type port: int
+        :param port: the port in which the daemon should listen
+        :type port: int
 
-        @return: a daemon instance
-        @rtype: EventsServerDaemon
+        :return: a daemon instance
+        :rtype: EventsServerDaemon
         """
         return cls.ensure_service(port, EventsServerService())
diff --git a/src/leap/common/files.py b/src/leap/common/files.py
index 4c443dd..bba281b 100644
--- a/src/leap/common/files.py
+++ b/src/leap/common/files.py
@@ -33,8 +33,8 @@ def check_and_fix_urw_only(cert):
 
     Might raise OSError
 
-    @param cert: Certificate path
-    @type cert: str
+    :param cert: Certificate path
+    :type cert: str
     """
     mode = stat.S_IMODE(os.stat(cert).st_mode)
 
@@ -53,10 +53,10 @@ def get_mtime(filename):
     """
     Returns the modified time or None if the file doesn't exist
 
-    @param filename: path to check
-    @type filename: str
+    :param filename: path to check
+    :type filename: str
 
-    @rtype: str
+    :rtype: str
     """
     try:
         mtime = time.ctime(os.path.getmtime(filename)) + " GMT"
@@ -72,8 +72,8 @@ def mkdir_p(path):
 
     Might raise OSError
 
-    @param path: path to create
-    @type path: str
+    :param path: path to create
+    :type path: str
     """
     try:
         os.makedirs(path)
@@ -97,14 +97,14 @@ def which(name, flags=os.X_OK, path_extension="/usr/sbin:/sbin"):
     On MS-Windows the only flag that has any meaning is os.F_OK. Any other
     flags will be ignored.
 
-    @type name: C{str}
-    @param name: The name for which to search.
+    :type name: C{str}
+    :param name: The name for which to search.
 
-    @type flags: C{int}
-    @param flags: Arguments to L{os.access}.
+    :type flags: C{int}
+    :param flags: Arguments to L{os.access}.
 
-    @rtype: C{list}
-    @param: A list of the full paths to files found, in the
+    :rtype: C{list}
+    :param: A list of the full paths to files found, in the
     order in which they were found.
     """
 
diff --git a/src/leap/common/keymanager/__init__.py b/src/leap/common/keymanager/__init__.py
index 7aaeddf..f5c5f5e 100644
--- a/src/leap/common/keymanager/__init__.py
+++ b/src/leap/common/keymanager/__init__.py
@@ -73,22 +73,22 @@ class KeyManager(object):
         Initialize a Key Manager for user's C{address} with provider's
         nickserver reachable in C{url}.
 
-        @param address: The address of the user of this Key Manager.
-        @type address: str
-        @param url: The URL of the nickserver.
-        @type url: str
-        @param soledad: A Soledad instance for local storage of keys.
-        @type soledad: leap.soledad.Soledad
-        @param session_id: The session ID for interacting with the webapp API.
-        @type session_id: str
-        @param ca_cert_path: The path to the CA certificate.
-        @type ca_cert_path: str
-        @param api_uri: The URI of the webapp API.
-        @type api_uri: str
-        @param api_version: The version of the webapp API.
-        @type api_version: str
-        @param uid: The users' UID.
-        @type uid: str
+        :param address: The address of the user of this Key Manager.
+        :type address: str
+        :param url: The URL of the nickserver.
+        :type url: str
+        :param soledad: A Soledad instance for local storage of keys.
+        :type soledad: leap.soledad.Soledad
+        :param session_id: The session ID for interacting with the webapp API.
+        :type session_id: str
+        :param ca_cert_path: The path to the CA certificate.
+        :type ca_cert_path: str
+        :param api_uri: The URI of the webapp API.
+        :type api_uri: str
+        :param api_version: The version of the webapp API.
+        :type api_version: str
+        :param uid: The users' UID.
+        :type uid: str
         """
         self._address = address
         self._nickserver_uri = nickserver_uri
@@ -145,13 +145,13 @@ class KeyManager(object):
         """
         Send a GET request to C{uri} containing C{data}.
 
-        @param uri: The URI of the request.
-        @type uri: str
-        @param data: The body of the request.
-        @type data: dict, str or file
+        :param uri: The URI of the request.
+        :type uri: str
+        :param data: The body of the request.
+        :type data: dict, str or file
 
-        @return: The response to the request.
-        @rtype: requests.Response
+        :return: The response to the request.
+        :rtype: requests.Response
         """
         leap_assert(
             self._ca_cert_path is not None,
@@ -172,13 +172,13 @@ class KeyManager(object):
         verify the server certificate and the configured session id for
         authentication.
 
-        @param uri: The URI of the request.
-        @type uri: str
-        @param data: The body of the request.
-        @type data: dict, str or file
+        :param uri: The URI of the request.
+        :type uri: str
+        :param data: The body of the request.
+        :type data: dict, str or file
 
-        @return: The response to the request.
-        @rtype: requests.Response
+        :return: The response to the request.
+        :rtype: requests.Response
         """
         leap_assert(
             self._ca_cert_path is not None,
@@ -198,8 +198,8 @@ class KeyManager(object):
         Fetch keys bound to C{address} from nickserver and insert them in
         local database.
 
-        @param address: The address bound to the keys.
-        @type address: str
+        :param address: The address bound to the keys.
+        :type address: str
 
         @raise KeyNotFound: If the key was not found on nickserver.
         """
@@ -228,8 +228,8 @@ class KeyManager(object):
         will be saved in the server in a way it is publicly retrievable
         through the hash string.
 
-        @param ktype: The type of the key.
-        @type ktype: KeyType
+        :param ktype: The type of the key.
+        :type ktype: KeyType
 
         @raise KeyNotFound: If the key was not found in local database.
         """
@@ -255,15 +255,15 @@ class KeyManager(object):
         First, search for the key in local storage. If it is not available,
         then try to fetch from nickserver.
 
-        @param address: The address bound to the key.
-        @type address: str
-        @param ktype: The type of the key.
-        @type ktype: KeyType
-        @param private: Look for a private key instead of a public one?
-        @type private: bool
+        :param address: The address bound to the key.
+        :type address: str
+        :param ktype: The type of the key.
+        :type ktype: KeyType
+        :param private: Look for a private key instead of a public one?
+        :type private: bool
 
-        @return: A key of type C{ktype} bound to C{address}.
-        @rtype: EncryptionKey
+        :return: A key of type C{ktype} bound to C{address}.
+        :rtype: EncryptionKey
         @raise KeyNotFound: If the key was not found both locally and in
             keyserver.
         """
@@ -285,8 +285,8 @@ class KeyManager(object):
         """
         Return all keys stored in local database.
 
-        @return: A list with all keys in local db.
-        @rtype: list
+        :return: A list with all keys in local db.
+        :rtype: list
         """
         return map(
             lambda doc: build_key_from_dict(
@@ -315,11 +315,11 @@ class KeyManager(object):
         """
         Generate a key of type C{ktype} bound to the user's address.
 
-        @param ktype: The type of the key.
-        @type ktype: KeyType
+        :param ktype: The type of the key.
+        :type ktype: KeyType
 
-        @return: The generated key.
-        @rtype: EncryptionKey
+        :return: The generated key.
+        :rtype: EncryptionKey
         """
         return self._wrapper_map[ktype].gen_key(self._address)
 
diff --git a/src/leap/common/keymanager/gpg.py b/src/leap/common/keymanager/gpg.py
index f3e6453..15c1d9f 100644
--- a/src/leap/common/keymanager/gpg.py
+++ b/src/leap/common/keymanager/gpg.py
@@ -43,8 +43,8 @@ class ListPackets():
         """
         Initialize the packet listing handling class.
 
-        @param gpg: GPG object instance.
-        @type gpg: gnupg.GPG
+        :param gpg: GPG object instance.
+        :type gpg: gnupg.GPG
         """
         self.gpg = gpg
         self.nodata = None
@@ -57,10 +57,10 @@ class ListPackets():
         """
         Handle one line of the --list-packets status message.
 
-        @param key: The status message key.
-        @type key: str
-        @param value: The status message value.
-        @type value: str
+        :param key: The status message key.
+        :type key: str
+        :param value: The status message value.
+        :type value: str
         """
         # TODO: write tests for handle_status
         if key == 'NODATA':
@@ -91,21 +91,21 @@ class GPGWrapper(gnupg.GPG):
         """
         Initialize a GnuPG process wrapper.
 
-        @param gpgbinary: Name for GnuPG binary executable.
-        @type gpgbinary: C{str}
-        @param gpghome: Full pathname to directory containing the public and
+        :param gpgbinary: Name for GnuPG binary executable.
+        :type gpgbinary: C{str}
+        :param gpghome: Full pathname to directory containing the public and
             private keyrings.
-        @type gpghome: C{str}
-        @param keyring: Name of alternative keyring file to use. If specified,
+        :type gpghome: C{str}
+        :param keyring: Name of alternative keyring file to use. If specified,
             the default keyring is not used.
-        @param verbose: Should some verbose info be output?
-        @type verbose: bool
-        @param use_agent: Should pass `--use-agent` to GPG binary?
-        @type use_agent: bool
-        @param keyring: Path for the keyring to use.
-        @type keyring: str
+        :param verbose: Should some verbose info be output?
+        :type verbose: bool
+        :param use_agent: Should pass `--use-agent` to GPG binary?
+        :type use_agent: bool
+        :param keyring: Path for the keyring to use.
+        :type keyring: str
         @options: A list of additional options to pass to the GPG binary.
-        @type options: list
+        :type options: list
 
         @raise: RuntimeError with explanation message if there is a problem
             invoking gpg.
@@ -119,13 +119,13 @@ class GPGWrapper(gnupg.GPG):
         """
         Find user's key based on their email.
 
-        @param email: Email address of key being searched for.
-        @type email: str
-        @param secret: Should we search for a secret key?
-        @type secret: bool
+        :param email: Email address of key being searched for.
+        :type email: str
+        :param secret: Should we search for a secret key?
+        :type secret: bool
 
-        @return: The fingerprint of the found key.
-        @rtype: str
+        :return: The fingerprint of the found key.
+        :rtype: str
         """
         for key in self.list_keys(secret=secret):
             for uid in key['uids']:
@@ -137,13 +137,13 @@ class GPGWrapper(gnupg.GPG):
         """
         Find user's key based on a subkey fingerprint.
 
-        @param email: Subkey fingerprint of the key being searched for.
-        @type email: str
-        @param secret: Should we search for a secret key?
-        @type secret: bool
+        :param email: Subkey fingerprint of the key being searched for.
+        :type email: str
+        :param secret: Should we search for a secret key?
+        :type secret: bool
 
-        @return: The fingerprint of the found key.
-        @rtype: str
+        :return: The fingerprint of the found key.
+        :rtype: str
         """
         for key in self.list_keys(secret=secret):
             for sub in key['subkeys']:
@@ -156,13 +156,13 @@ class GPGWrapper(gnupg.GPG):
         """
         Find user's key based on the key ID.
 
-        @param email: The key ID of the key being searched for.
-        @type email: str
-        @param secret: Should we search for a secret key?
-        @type secret: bool
+        :param email: The key ID of the key being searched for.
+        :type email: str
+        :param secret: Should we search for a secret key?
+        :type secret: bool
 
-        @return: The fingerprint of the found key.
-        @rtype: str
+        :return: The fingerprint of the found key.
+        :rtype: str
         """
         for key in self.list_keys(secret=secret):
             if keyid == key['keyid']:
@@ -174,13 +174,13 @@ class GPGWrapper(gnupg.GPG):
         """
         Find user's key based on the key fingerprint.
 
-        @param email: The fingerprint of the key being searched for.
-        @type email: str
-        @param secret: Should we search for a secret key?
-        @type secret: bool
+        :param email: The fingerprint of the key being searched for.
+        :type email: str
+        :param secret: Should we search for a secret key?
+        :type secret: bool
 
-        @return: The fingerprint of the found key.
-        @rtype: str
+        :return: The fingerprint of the found key.
+        :rtype: str
         """
         for key in self.list_keys(secret=secret):
             if fingerprint == key['fingerprint']:
@@ -193,23 +193,23 @@ class GPGWrapper(gnupg.GPG):
         """
         Encrypt data using GPG.
 
-        @param data: The data to be encrypted.
-        @type data: str
-        @param recipient: The address of the public key to be used.
-        @type recipient: str
-        @param sign: Should the encrypted content be signed?
-        @type sign: bool
-        @param always_trust: Skip key validation and assume that used keys
+        :param data: The data to be encrypted.
+        :type data: str
+        :param recipient: The address of the public key to be used.
+        :type recipient: str
+        :param sign: Should the encrypted content be signed?
+        :type sign: bool
+        :param always_trust: Skip key validation and assume that used keys
             are always fully trusted?
-        @type always_trust: bool
-        @param passphrase: The passphrase to be used if symmetric encryption
+        :type always_trust: bool
+        :param passphrase: The passphrase to be used if symmetric encryption
             is desired.
-        @type passphrase: str
-        @param symmetric: Should we encrypt to a password?
-        @type symmetric: bool
+        :type passphrase: str
+        :param symmetric: Should we encrypt to a password?
+        :type symmetric: bool
 
-        @return: An object with encrypted result in the `data` field.
-        @rtype: gnupg.Crypt
+        :return: An object with encrypted result in the `data` field.
+        :rtype: gnupg.Crypt
         """
         # TODO: devise a way so we don't need to "always trust".
         return gnupg.GPG.encrypt(self, data, recipient, sign=sign,
@@ -222,17 +222,17 @@ class GPGWrapper(gnupg.GPG):
         """
         Decrypt data using GPG.
 
-        @param data: The data to be decrypted.
-        @type data: str
-        @param always_trust: Skip key validation and assume that used keys
+        :param data: The data to be decrypted.
+        :type data: str
+        :param always_trust: Skip key validation and assume that used keys
             are always fully trusted?
-        @type always_trust: bool
-        @param passphrase: The passphrase to be used if symmetric encryption
+        :type always_trust: bool
+        :param passphrase: The passphrase to be used if symmetric encryption
             is desired.
-        @type passphrase: str
+        :type passphrase: str
 
-        @return: An object with decrypted result in the `data` field.
-        @rtype: gnupg.Crypt
+        :return: An object with decrypted result in the `data` field.
+        :rtype: gnupg.Crypt
         """
         # TODO: devise a way so we don't need to "always trust".
         return gnupg.GPG.decrypt(self, data, always_trust=always_trust,
@@ -242,13 +242,13 @@ class GPGWrapper(gnupg.GPG):
         """
         Send keys to a keyserver
 
-        @param keyserver: The keyserver to send the keys to.
-        @type keyserver: str
-        @param keyids: The key ids to send.
-        @type keyids: list
+        :param keyserver: The keyserver to send the keys to.
+        :type keyserver: str
+        :param keyids: The key ids to send.
+        :type keyids: list
 
-        @return: A list of keys sent to server.
-        @rtype: gnupg.ListKeys
+        :return: A list of keys sent to server.
+        :rtype: gnupg.ListKeys
         """
         # TODO: write tests for this.
         # TODO: write a SendKeys class to handle status for this.
@@ -269,29 +269,29 @@ class GPGWrapper(gnupg.GPG):
         """
         Encrypt the message read from the file-like object 'file'.
 
-        @param file: The file to be encrypted.
-        @type data: file
-        @param recipient: The address of the public key to be used.
-        @type recipient: str
-        @param sign: Should the encrypted content be signed?
-        @type sign: bool
-        @param always_trust: Skip key validation and assume that used keys
+        :param file: The file to be encrypted.
+        :type data: file
+        :param recipient: The address of the public key to be used.
+        :type recipient: str
+        :param sign: Should the encrypted content be signed?
+        :type sign: bool
+        :param always_trust: Skip key validation and assume that used keys
             are always fully trusted?
-        @type always_trust: bool
-        @param passphrase: The passphrase to be used if symmetric encryption
+        :type always_trust: bool
+        :param passphrase: The passphrase to be used if symmetric encryption
             is desired.
-        @type passphrase: str
-        @param armor: Create ASCII armored output?
-        @type armor: bool
-        @param output: Path of file to write results in.
-        @type output: str
-        @param symmetric: Should we encrypt to a password?
-        @type symmetric: bool
-        @param cipher_algo: Algorithm to use.
-        @type cipher_algo: str
-
-        @return: An object with encrypted result in the `data` field.
-        @rtype: gnupg.Crypt
+        :type passphrase: str
+        :param armor: Create ASCII armored output?
+        :type armor: bool
+        :param output: Path of file to write results in.
+        :type output: str
+        :param symmetric: Should we encrypt to a password?
+        :type symmetric: bool
+        :param cipher_algo: Algorithm to use.
+        :type cipher_algo: str
+
+        :return: An object with encrypted result in the `data` field.
+        :rtype: gnupg.Crypt
         """
         args = ['--encrypt']
         if symmetric:
@@ -323,11 +323,11 @@ class GPGWrapper(gnupg.GPG):
         """
         List the sequence of packets.
 
-        @param data: The data to extract packets from.
-        @type data: str
+        :param data: The data to extract packets from.
+        :type data: str
 
-        @return: An object with packet info.
-        @rtype ListPackets
+        :return: An object with packet info.
+        :rtype ListPackets
         """
         args = ["--list-packets"]
         result = self.result_map['list-packets'](self)
@@ -342,11 +342,11 @@ class GPGWrapper(gnupg.GPG):
         """
         Return the key to which data is encrypted to.
 
-        @param data: The data to be examined.
-        @type data: str
+        :param data: The data to be examined.
+        :type data: str
 
-        @return: The fingerprint of the key to which data is encrypted to.
-        @rtype: str
+        :return: The fingerprint of the key to which data is encrypted to.
+        :rtype: str
         """
         # TODO: make this support multiple keys.
         result = self.list_packets(data)
@@ -362,11 +362,11 @@ class GPGWrapper(gnupg.GPG):
         """
         Say whether some chunk of data is encrypted to a symmetric key.
 
-        @param data: The data to be examined.
-        @type data: str
+        :param data: The data to be examined.
+        :type data: str
 
-        @return: Whether data is encrypted to a symmetric key.
-        @rtype: bool
+        :return: Whether data is encrypted to a symmetric key.
+        :rtype: bool
         """
         result = self.list_packets(data)
         return bool(result.need_passphrase_sym)
@@ -375,11 +375,11 @@ class GPGWrapper(gnupg.GPG):
         """
         Say whether some chunk of data is encrypted to a private key.
 
-        @param data: The data to be examined.
-        @type data: str
+        :param data: The data to be examined.
+        :type data: str
 
-        @return: Whether data is encrypted to a private key.
-        @rtype: bool
+        :return: Whether data is encrypted to a private key.
+        :rtype: bool
         """
         result = self.list_packets(data)
         return bool(result.key)
@@ -388,10 +388,10 @@ class GPGWrapper(gnupg.GPG):
         """
         Say whether some chunk of data is encrypted to a key.
 
-        @param data: The data to be examined.
-        @type data: str
+        :param data: The data to be examined.
+        :type data: str
 
-        @return: Whether data is encrypted to a key.
-        @rtype: bool
+        :return: Whether data is encrypted to a key.
+        :rtype: bool
         """
         return self.is_encrypted_asym(data) or self.is_encrypted_sym(data)
diff --git a/src/leap/common/keymanager/keys.py b/src/leap/common/keymanager/keys.py
index 1d87858..f2c1beb 100644
--- a/src/leap/common/keymanager/keys.py
+++ b/src/leap/common/keymanager/keys.py
@@ -65,10 +65,10 @@ def is_address(address):
     """
     Return whether the given C{address} is in the form user@provider.
 
-    @param address: The address to be tested.
-    @type address: str
-    @return: Whether C{address} is in the form user@provider.
-    @rtype: bool
+    :param address: The address to be tested.
+    :type address: str
+    :return: Whether C{address} is in the form user@provider.
+    :rtype: bool
     """
     return bool(re.match('[\w.-]+@[\w.-]+', address))
 
@@ -77,12 +77,12 @@ def build_key_from_dict(kClass, address, kdict):
     """
     Build an C{kClass} key bound to C{address} based on info in C{kdict}.
 
-    @param address: The address bound to the key.
-    @type address: str
-    @param kdict: Dictionary with key data.
-    @type kdict: dict
-    @return: An instance of the key.
-    @rtype: C{kClass}
+    :param address: The address bound to the key.
+    :type address: str
+    :param kdict: Dictionary with key data.
+    :type kdict: dict
+    :return: An instance of the key.
+    :rtype: C{kClass}
     """
     leap_assert(
         address == kdict[KEY_ADDRESS_KEY],
@@ -106,15 +106,15 @@ def keymanager_doc_id(ktype, address, private=False):
     Return the document id for the document containing a key for
     C{address}.
 
-    @param address: The type of the key.
-    @type address: KeyType
-    @param address: The address bound to the key.
-    @type address: str
-    @param private: Whether the key is private or not.
-    @type private: bool
-    @return: The document id for the document that stores a key bound to
+    :param address: The type of the key.
+    :type address: KeyType
+    :param address: The address bound to the key.
+    :type address: str
+    :param private: Whether the key is private or not.
+    :type private: bool
+    :return: The document id for the document that stores a key bound to
         C{address}.
-    @rtype: str
+    :rtype: str
     """
     leap_assert(is_address(address), "Wrong address format: %s" % address)
     ktype = str(ktype)
@@ -163,8 +163,8 @@ class EncryptionKey(object):
         """
         Return a JSON string describing this key.
 
-        @return: The JSON string describing this key.
-        @rtype: str
+        :return: The JSON string describing this key.
+        :rtype: str
         """
         return json.dumps({
             KEY_ADDRESS_KEY: self.address,
@@ -211,8 +211,8 @@ class EncryptionScheme(object):
         """
         Initialize this Encryption Scheme.
 
-        @param soledad: A Soledad instance for local storage of keys.
-        @type soledad: leap.soledad.Soledad
+        :param soledad: A Soledad instance for local storage of keys.
+        :type soledad: leap.soledad.Soledad
         """
         self._soledad = soledad
 
@@ -221,13 +221,13 @@ class EncryptionScheme(object):
         """
         Get key from local storage.
 
-        @param address: The address bound to the key.
-        @type address: str
-        @param private: Look for a private key instead of a public one?
-        @type private: bool
+        :param address: The address bound to the key.
+        :type address: str
+        :param private: Look for a private key instead of a public one?
+        :type private: bool
 
-        @return: The key bound to C{address}.
-        @rtype: EncryptionKey
+        :return: The key bound to C{address}.
+        :rtype: EncryptionKey
         @raise KeyNotFound: If the key was not found on local storage.
         """
         pass
@@ -237,8 +237,8 @@ class EncryptionScheme(object):
         """
         Put a key in local storage.
 
-        @param key: The key to be stored.
-        @type key: EncryptionKey
+        :param key: The key to be stored.
+        :type key: EncryptionKey
         """
         pass
 
@@ -247,11 +247,11 @@ class EncryptionScheme(object):
         """
         Generate a new key.
 
-        @param address: The address bound to the key.
-        @type address: str
+        :param address: The address bound to the key.
+        :type address: str
 
-        @return: The key bound to C{address}.
-        @rtype: EncryptionKey
+        :return: The key bound to C{address}.
+        :rtype: EncryptionKey
         """
         pass
 
@@ -260,7 +260,7 @@ class EncryptionScheme(object):
         """
         Remove C{key} from storage.
 
-        @param key: The key to be removed.
-        @type key: EncryptionKey
+        :param key: The key to be removed.
+        :type key: EncryptionKey
         """
         pass
diff --git a/src/leap/common/keymanager/openpgp.py b/src/leap/common/keymanager/openpgp.py
index d53afd6..b08bff6 100644
--- a/src/leap/common/keymanager/openpgp.py
+++ b/src/leap/common/keymanager/openpgp.py
@@ -48,11 +48,11 @@ def temporary_gpgwrapper(keys=None):
     Returns a unitary gpg wrapper that implements context manager
     protocol.
 
-    @param key_data: ASCII armored key data.
-    @type key_data: str
+    :param key_data: ASCII armored key data.
+    :type key_data: str
 
-    @return: a GPGWrapper instance
-    @rtype: GPGWrapper
+    :return: a GPGWrapper instance
+    :rtype: GPGWrapper
     """
     # TODO do here checks on key_data
     return TempGPGWrapper(keys=keys)
@@ -168,8 +168,8 @@ class TempGPGWrapper(object):
     """
     def __init__(self, keys=None):
         """
-        @param keys: OpenPGP key, or list of.
-        @type keys: OpenPGPKey or list of OpenPGPKeys
+        :param keys: OpenPGP key, or list of.
+        :type keys: OpenPGPKey or list of OpenPGPKeys
         """
         self._gpg = None
         if not keys:
@@ -184,8 +184,8 @@ class TempGPGWrapper(object):
         """
         Calls the unitary gpgwrapper initializer
 
-        @return: A GPG wrapper with a unitary keyring.
-        @rtype: gnupg.GPG
+        :return: A GPG wrapper with a unitary keyring.
+        :rtype: gnupg.GPG
         """
         self._build_keyring()
         return self._gpg
@@ -201,11 +201,11 @@ class TempGPGWrapper(object):
         """
         Create an empty GPG keyring and import C{keys} into it.
 
-        @param keys: List of keys to add to the keyring.
-        @type keys: list of OpenPGPKey
+        :param keys: List of keys to add to the keyring.
+        :type keys: list of OpenPGPKey
 
-        @return: A GPG wrapper with a unitary keyring.
-        @rtype: gnupg.GPG
+        :return: A GPG wrapper with a unitary keyring.
+        :rtype: gnupg.GPG
         """
         privkeys = [key for key in self._keys if key and key.private is True]
         publkeys = [key for key in self._keys if key and key.private is False]
@@ -275,15 +275,15 @@ def encrypt_asym(data, key, passphrase=None, sign=None):
     """
     Encrypt C{data} using public @{key} and sign with C{sign} key.
 
-    @param data: The data to be encrypted.
-    @type data: str
-    @param pubkey: The key used to encrypt.
-    @type pubkey: OpenPGPKey
-    @param sign: The key used for signing.
-    @type sign: OpenPGPKey
+    :param data: The data to be encrypted.
+    :type data: str
+    :param pubkey: The key used to encrypt.
+    :type pubkey: OpenPGPKey
+    :param sign: The key used for signing.
+    :type sign: OpenPGPKey
 
-    @return: The encrypted data.
-    @rtype: str
+    :return: The encrypted data.
+    :rtype: str
     """
     leap_assert_type(key, OpenPGPKey)
     leap_assert(key.private is False, 'Key is not public.')
@@ -307,15 +307,15 @@ def decrypt_asym(data, key, passphrase=None, verify=None):
     """
     Decrypt C{data} using private @{key} and verify with C{verify} key.
 
-    @param data: The data to be decrypted.
-    @type data: str
-    @param privkey: The key used to decrypt.
-    @type privkey: OpenPGPKey
-    @param verify: The key used to verify a signature.
-    @type verify: OpenPGPKey
+    :param data: The data to be decrypted.
+    :type data: str
+    :param privkey: The key used to decrypt.
+    :type privkey: OpenPGPKey
+    :param verify: The key used to verify a signature.
+    :type verify: OpenPGPKey
 
-    @return: The decrypted data.
-    @rtype: str
+    :return: The decrypted data.
+    :rtype: str
 
     @raise InvalidSignature: Raised if unable to verify the signature with
         C{verify} key.
@@ -334,11 +334,11 @@ def is_encrypted(data):
     """
     Return whether C{data} was encrypted using OpenPGP.
 
-    @param data: The data we want to know about.
-    @type data: str
+    :param data: The data we want to know about.
+    :type data: str
 
-    @return: Whether C{data} was encrypted using this wrapper.
-    @rtype: bool
+    :return: Whether C{data} was encrypted using this wrapper.
+    :rtype: bool
     """
     return lambda gpg: gpg.is_encrypted(data)
 
@@ -348,11 +348,11 @@ def is_encrypted_asym(data):
     """
     Return whether C{data} was asymmetrically encrypted using OpenPGP.
 
-    @param data: The data we want to know about.
-    @type data: str
+    :param data: The data we want to know about.
+    :type data: str
 
-    @return: Whether C{data} was encrypted using this wrapper.
-    @rtype: bool
+    :return: Whether C{data} was encrypted using this wrapper.
+    :rtype: bool
     """
     return lambda gpg: gpg.is_encrypted_asym(data)
 
@@ -362,14 +362,14 @@ def sign(data, privkey):
     """
     Sign C{data} with C{privkey}.
 
-    @param data: The data to be signed.
-    @type data: str
+    :param data: The data to be signed.
+    :type data: str
 
-    @param privkey: The private key to be used to sign.
-    @type privkey: OpenPGPKey
+    :param privkey: The private key to be used to sign.
+    :type privkey: OpenPGPKey
 
-    @return: The ascii-armored signed data.
-    @rtype: str
+    :return: The ascii-armored signed data.
+    :rtype: str
     """
     leap_assert_type(privkey, OpenPGPKey)
     leap_assert(privkey.private is True)
@@ -384,14 +384,14 @@ def verify(data, key):
     """
     Verify signed C{data} with C{pubkey}.
 
-    @param data: The data to be verified.
-    @type data: str
+    :param data: The data to be verified.
+    :type data: str
 
-    @param pubkey: The public key to be used on verification.
-    @type pubkey: OpenPGPKey
+    :param pubkey: The public key to be used on verification.
+    :type pubkey: OpenPGPKey
 
-    @return: The ascii-armored signed data.
-    @rtype: str
+    :return: The ascii-armored signed data.
+    :rtype: str
     """
     leap_assert_type(key, OpenPGPKey)
     leap_assert(key.private is False)
@@ -412,14 +412,14 @@ def _build_key_from_gpg(address, key, key_data):
     ASCII armored GPG key data has to be queried independently in this
     wrapper, so we receive it in C{key_data}.
 
-    @param address: The address bound to the key.
-    @type address: str
-    @param key: Key obtained from GPG storage.
-    @type key: dict
-    @param key_data: Key data obtained from GPG storage.
-    @type key_data: str
-    @return: An instance of the key.
-    @rtype: OpenPGPKey
+    :param address: The address bound to the key.
+    :type address: str
+    :param key: Key obtained from GPG storage.
+    :type key: dict
+    :param key_data: Key data obtained from GPG storage.
+    :type key_data: str
+    :return: An instance of the key.
+    :rtype: OpenPGPKey
     """
     return OpenPGPKey(
         address,
@@ -452,8 +452,8 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Initialize the OpenPGP wrapper.
 
-        @param soledad: A Soledad instance for key storage.
-        @type soledad: leap.soledad.Soledad
+        :param soledad: A Soledad instance for key storage.
+        :type soledad: leap.soledad.Soledad
         """
         EncryptionScheme.__init__(self, soledad)
 
@@ -461,10 +461,10 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Generate an OpenPGP keypair bound to C{address}.
 
-        @param address: The address bound to the key.
-        @type address: str
-        @return: The key bound to C{address}.
-        @rtype: OpenPGPKey
+        :param address: The address bound to the key.
+        :type address: str
+        :return: The key bound to C{address}.
+        :rtype: OpenPGPKey
         @raise KeyAlreadyExists: If key already exists in local database.
         """
         # make sure the key does not already exist
@@ -513,13 +513,13 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Get key bound to C{address} from local storage.
 
-        @param address: The address bound to the key.
-        @type address: str
-        @param private: Look for a private key instead of a public one?
-        @type private: bool
+        :param address: The address bound to the key.
+        :type address: str
+        :param private: Look for a private key instead of a public one?
+        :type private: bool
 
-        @return: The key bound to C{address}.
-        @rtype: OpenPGPKey
+        :return: The key bound to C{address}.
+        :rtype: OpenPGPKey
         @raise KeyNotFound: If the key was not found on local storage.
         """
         leap_assert(is_address(address), 'Not an user address: %s' % address)
@@ -532,8 +532,8 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Put key contained in ascii-armored C{key_data} in local storage.
 
-        @param key_data: The key data to be stored.
-        @type key_data: str
+        :param key_data: The key data to be stored.
+        :type key_data: str
         """
         leap_assert_type(key_data, str)
         # TODO: add more checks for correct key data.
@@ -583,8 +583,8 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Put C{key} in local storage.
 
-        @param key: The key to be stored.
-        @type key: OpenPGPKey
+        :param key: The key to be stored.
+        :type key: OpenPGPKey
         """
         doc = self._get_key_doc(key.address, private=key.private)
         if doc is None:
@@ -602,12 +602,12 @@ class OpenPGPScheme(EncryptionScheme):
 
         If C{private} is True, looks for a private key instead of a public.
 
-        @param address: The address bound to the key.
-        @type address: str
-        @param private: Whether to look for a private key.
-        @type private: bool
-        @return: The document with the key or None if it does not exist.
-        @rtype: leap.soledad.backends.leap_backend.LeapDocument
+        :param address: The address bound to the key.
+        :type address: str
+        :param private: Whether to look for a private key.
+        :type private: bool
+        :return: The document with the key or None if it does not exist.
+        :rtype: leap.soledad.backends.leap_backend.LeapDocument
         """
         return self._soledad.get_doc(
             keymanager_doc_id(OpenPGPKey, address, private))
@@ -616,8 +616,8 @@ class OpenPGPScheme(EncryptionScheme):
         """
         Remove C{key} from storage.
 
-        @param key: The key to be removed.
-        @type key: EncryptionKey
+        :param key: The key to be removed.
+        :type key: EncryptionKey
         """
         leap_assert(key.__class__ is OpenPGPKey, 'Wrong key type.')
         stored_key = self.get_key(key.address, private=key.private)
diff --git a/src/leap/common/testing/basetest.py b/src/leap/common/testing/basetest.py
index 65e23a9..8890bf9 100644
--- a/src/leap/common/testing/basetest.py
+++ b/src/leap/common/testing/basetest.py
@@ -94,8 +94,8 @@ class BaseLeapTest(unittest.TestCase):
         Raises NotImplementedError for this platform
         if do_raise is True
 
-        @param do_raise: flag to actually raise exception
-        @type do_raise: bool
+        :param do_raise: flag to actually raise exception
+        :type do_raise: bool
         """
         if do_raise:
             raise NotImplementedError(
@@ -109,8 +109,8 @@ class BaseLeapTest(unittest.TestCase):
         prepending the temporal dir associated with this
         TestCase
 
-        @param filename: the filename
-        @type filename: str
+        :param filename: the filename
+        :type filename: str
         """
         return os.path.join(self.tempdir, filename)
 
@@ -119,8 +119,8 @@ class BaseLeapTest(unittest.TestCase):
         Touches a filepath, creating folders along
         the way if needed.
 
-        @param filepath: path to be touched
-        @type filepath: str
+        :param filepath: path to be touched
+        :type filepath: str
         """
         folder, filename = os.path.split(filepath)
         if not os.path.isdir(folder):
@@ -134,7 +134,7 @@ class BaseLeapTest(unittest.TestCase):
         """
         Chmods 600 a file
 
-        @param filepath: filepath to be chmodded
-        @type filepath: str
+        :param filepath: filepath to be chmodded
+        :type filepath: str
         """
         check_and_fix_urw_only(filepath)
diff --git a/src/leap/common/testing/test_basetest.py b/src/leap/common/testing/test_basetest.py
index 220e28d..cf0962d 100644
--- a/src/leap/common/testing/test_basetest.py
+++ b/src/leap/common/testing/test_basetest.py
@@ -38,8 +38,8 @@ class _TestCaseRunner(object):
         """
         Runs a given TestCase
 
-        @param testcase: the testcase
-        @type testcase: unittest.TestCase
+        :param testcase: the testcase
+        :type testcase: unittest.TestCase
         """
         if not testcase:
             return None