[X2Go-Commits] [python-x2go] 04/04: sphinx docs: The logging module is x2go.log, not x2go.logger.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a36fd9fe033a1added491caee5b2c723bfd2d3aa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 6 17:54:36 2018 +0200 sphinx docs: The logging module is x2go.log, not x2go.logger. --- x2go/backends/control/plain.py | 6 +++--- x2go/backends/printing/file.py | 4 ++-- x2go/backends/printing/winreg.py | 4 ++-- x2go/backends/profiles/base.py | 6 +++--- x2go/backends/profiles/file.py | 6 +++--- x2go/backends/profiles/httpbroker.py | 6 +++--- x2go/backends/profiles/sshbroker.py | 6 +++--- x2go/backends/profiles/winreg.py | 6 +++--- x2go/backends/proxy/base.py | 6 +++--- x2go/backends/terminal/plain.py | 6 +++--- x2go/cache.py | 4 ++-- x2go/client.py | 4 ++-- x2go/forward.py | 4 ++-- x2go/guardian.py | 4 ++-- x2go/inifiles.py | 6 +++--- x2go/mimebox.py | 4 ++-- x2go/mimeboxactions.py | 16 ++++++++-------- x2go/printactions.py | 24 ++++++++++++------------ x2go/printqueue.py | 4 ++-- x2go/pulseaudio.py | 4 ++-- x2go/registry.py | 4 ++-- x2go/rforward.py | 10 +++++----- x2go/sftpserver.py | 16 ++++++++-------- x2go/sshproxy.py | 6 +++--- x2go/telekinesis.py | 6 +++--- x2go/xserver.py | 8 ++++---- 26 files changed, 90 insertions(+), 90 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 4ca8df3..15d14b5 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -169,10 +169,10 @@ class X2GoControlSession(paramiko.SSHClient): :param published_applications_no_submenus: published applications menus with less items than ``published_applications_no_submenus`` are rendered without submenus :type published_applications_no_submenus: ``int`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.control.plain.X2GoControlSession` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` :param low_latency: set this boolean switch for weak connections, it will double all timeout values. diff --git a/x2go/backends/printing/file.py b/x2go/backends/printing/file.py index fae8de9..d16c613 100644 --- a/x2go/backends/printing/file.py +++ b/x2go/backends/printing/file.py @@ -89,10 +89,10 @@ class X2GoClientPrinting(inifiles.X2GoIniFile): :param defaults: a cascaded Python dicitionary structure with ini file defaults (to override Python X2Go's hard coded defaults in :mod:`x2go.defaults` :type defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintAction` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/printing/winreg.py b/x2go/backends/printing/winreg.py index dcbc786..a815286 100644 --- a/x2go/backends/printing/winreg.py +++ b/x2go/backends/printing/winreg.py @@ -66,10 +66,10 @@ class X2GoClientPrinting(object): :param defaults: a cascaded Python dicitionary structure with ini file defaults (to override Python X2Go's hard coded defaults in :mod:`x2go.defaults` :type defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintAction` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 008dd94..2b46ef3 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -56,10 +56,10 @@ class X2GoSessionProfiles(object): :param session_profile_defaults: a default session profile :type session_profile_defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.profiles.httpbroker.X2GoSessionProfiles` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/profiles/file.py b/x2go/backends/profiles/file.py index 72f8185..0bc765a 100644 --- a/x2go/backends/profiles/file.py +++ b/x2go/backends/profiles/file.py @@ -47,10 +47,10 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles, inifiles.X2GoIniFile): :type config_files: ``list`` :param session_profile_defaults: a default session profile :type session_profile_defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.profiles.file.X2GoSessionProfiles` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py index 62805b3..30e8105 100644 --- a/x2go/backends/profiles/httpbroker.py +++ b/x2go/backends/profiles/httpbroker.py @@ -68,10 +68,10 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles): :param broker_password: use this password for authentication against the X2Go Session Broker (avoid password string in the ``broker_URL`` parameter is highly recommended) :type broker_password: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.profiles.httpbroker.X2GoSessionProfiles` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/profiles/sshbroker.py b/x2go/backends/profiles/sshbroker.py index 19b5769..2c83839 100644 --- a/x2go/backends/profiles/sshbroker.py +++ b/x2go/backends/profiles/sshbroker.py @@ -51,10 +51,10 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles): :param session_profile_defaults: a default session profile :type session_profile_defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.profiles.httpbroker.X2GoSessionProfiles` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/profiles/winreg.py b/x2go/backends/profiles/winreg.py index 450bad1..45a795a 100644 --- a/x2go/backends/profiles/winreg.py +++ b/x2go/backends/profiles/winreg.py @@ -52,10 +52,10 @@ class X2GoSessionProfilesWINREG(base.X2GoSessionProfiles): :param session_profile_defaults: a default session profile :type session_profile_defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.profiles.winreg.X2GoSessionProfilesWINREG` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index e733c48..828f04e 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -91,12 +91,12 @@ class X2GoProxy(threading.Thread): :param proxy_options: a set of very :class:`X2GoProxy <x2go.backends.proxy.base.X2GoProxy>` backend specific options; any option that is not known to the :class:`x2go.backends.proxy.base.X2GoProxy` backend will simply be ignored :type proxy_options: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.proxy.base.X2GoProxy` constructor :param session_instance: the :class:`x2go.session.X2GoSession` instance this :class:`x2go.backends.proxy.base.X2GoProxy` instance belongs to :type session_instance: :class:`x2go.session.X2GoSession` instance - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: int diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py index 48cd500..217cc5d 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -320,10 +320,10 @@ class X2GoTerminalSession(object): :type sessions_rootdir: ``str`` :param session_instance: the :class:`x2go.session.X2GoSession` instance that is parent to this terminal session :type session_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.backends.terminal.plain.X2GoTerminalSession` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/cache.py b/x2go/cache.py index 170bd8f..2d5298e 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -60,9 +60,9 @@ class X2GoListSessionsCache(object): """\ :param client_instance: the :class:`x2go.client.X2GoClient` instance that uses this :class:`x2go.cache.X2GoListSessionsCache` :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.cache.X2GoListSessionsCache` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.cache.X2GoListSessionsCache` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/client.py b/x2go/client.py index 210fa67..32be4b8 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -253,9 +253,9 @@ class X2GoClient(object): :type refresh_interval: ``int`` :param pulseaudio_installdir: install path of Pulseaudio binary :type pulseaudio_installdir: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.client.X2GoClient` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance + :type logger: :class:`x2go.log.X2GoLogger` instance :param loglevel: if no X2GoLogger object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/forward.py b/x2go/forward.py index 89b18c1..684e8bf 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -65,10 +65,10 @@ class X2GoFwServer(StreamServer): :type session_instance: ``obj`` :param session_name: the session name of the X2Go session this port forwarding server belongs to :type session_name: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.forward.X2GoFwServer` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/guardian.py b/x2go/guardian.py index 6b4d80f..014663d 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -73,9 +73,9 @@ class X2GoSessionGuardian(threading.Thread): :type no_auto_reg_pubapp_sessions: ``bool`` :param refresh_interval: refresh cache and session registry every <refresh_interval> seconds :type refresh_interval: ``int`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.guardian.X2GoSessionGuardian` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.guardian.X2GoSessionGuardian` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 896b9b0..c4de620 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -63,10 +63,10 @@ class X2GoIniFile(object): :param defaults: a cascaded Python dicitionary structure with ini file defaults (to override Python X2Go's hard coded defaults in :mod:`x2go.defaults` :type defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.inifiles.X2GoIniFile` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/mimebox.py b/x2go/mimebox.py index d6c5f27..e6c2863 100644 --- a/x2go/mimebox.py +++ b/x2go/mimebox.py @@ -72,10 +72,10 @@ class X2GoMIMEboxQueue(threading.Thread): :type mimebox_action: ``str`` or instance :param client_instance: the underlying :class:`x2go.client.X2GoClient` instance :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.mimebox.X2GoMIMEboxQueue` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index d018178..24fe431 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -62,10 +62,10 @@ class X2GoMIMEboxAction(object): :param client_instance: the underlying :class:`x2go.client.X2GoClient` instance :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.mimeboxactions.X2GoMIMEboxAction` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -150,10 +150,10 @@ class X2GoMIMEboxActionOPEN(X2GoMIMEboxAction): """\ :param client_instance: the underlying :class:`x2go.client.X2GoClient` instance :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.mimeboxactions.X2GoMIMEboxActionOPEN` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -209,10 +209,10 @@ class X2GoMIMEboxActionOPENWITH(X2GoMIMEboxAction): """\ :param client_instance: the underlying :class:`x2go.client.X2GoClient` instance :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.mimeboxactions.X2GoMIMEboxActionOPENWITH` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -270,10 +270,10 @@ class X2GoMIMEboxActionSAVEAS(X2GoMIMEboxAction): you have a ``HOOK_open_mimebox_saveas_dialog(filename=<str>)`` method defined that will actually handle the incoming mimebox file. :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.mimeboxactions.X2GoMIMEboxActionSAVEAS` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/printactions.py b/x2go/printactions.py index 78fd928..027f0e0 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -71,10 +71,10 @@ class X2GoPrintAction(object): :param client_instance: the underlying :class:`x2go.client.X2GoClient` instance :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintAction` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -190,10 +190,10 @@ class X2GoPrintActionPDFVIEW(X2GoPrintAction): :type client_instance: ``obj`` :param pdfview_cmd: command that starts the external PDF viewer application :type pdfview_cmd: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintActionPDFVIEW` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -268,10 +268,10 @@ class X2GoPrintActionPDFSAVE(X2GoPrintAction): :type client_instance: ``obj`` :param save_to_folder: saving location for incoming print jobs (PDF files) :type save_to_folder: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintActionPDFSAVE` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -324,10 +324,10 @@ class X2GoPrintActionPRINT(X2GoPrintAction): :type client_instance: ``obj`` :param printer: name of the preferred printer, if ``None`` the system's/user's default printer will be used :type printer: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintActionPRINT` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -454,10 +454,10 @@ class X2GoPrintActionPRINTCMD(X2GoPrintAction): :type client_instance: ``obj`` :param print_cmd: external command to be called on incoming print jobs :type print_cmd: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintActionPRINTCMD` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -515,10 +515,10 @@ class X2GoPrintActionDIALOG(X2GoPrintAction): you have a ``HOOK_open_print_dialog(filename=<str>)`` method defined that will actually open the print dialog. :type client_instance: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printactions.X2GoPrintActionDIALOG` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/printqueue.py b/x2go/printqueue.py index d53d0a0..69f94d4 100644 --- a/x2go/printqueue.py +++ b/x2go/printqueue.py @@ -81,10 +81,10 @@ class X2GoPrintQueue(threading.Thread): :type client_instance: ``obj`` :param printing_backend: the client printing configuration backend class :type printing_backend: ``obj`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.printing.X2GoPrintQueue` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 21b20f1..7e2d1ba 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -63,9 +63,9 @@ class X2GoPulseAudio(threading.Thread): :type path: ``str`` :param client_instance: the calling :class:`x2go.client.X2GoClient` instance :type client_instance: :class:`x2go.client.X2GoClient` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/registry.py b/x2go/registry.py index bbc3daf..7f4b3d8 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -62,9 +62,9 @@ class X2GoSessionRegistry(object): """\ :param client_instance: the :class:`x2go.client.X2GoClient` instance that instantiated this :class:`x2go.registry.X2GoSessionRegistry` instance. :type client_instance: :class:`x2go.client.X2GoClient` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` diff --git a/x2go/rforward.py b/x2go/rforward.py index cc17818..379b20a 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -109,10 +109,10 @@ class X2GoRevFwTunnel(threading.Thread): :type remote_port: int :param ssh_transport: the :class:`x2go.session.X2GoSession`'s Paramiko/SSH transport instance :type ssh_transport: ``paramiko.Transport`` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.rforward.X2GoRevFwTunnel` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: int @@ -310,9 +310,9 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N :type port: ``int`` :param parent_thread: the calling :class:`x2go.rforward.X2GoRevFwTunnel` instance (Default value = None) :type parent_thread: :class:`x2go.rforward.X2GoRevFwTunnel` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.rforward.X2GoRevFwTunnel` constructor (Default value = None) - :type logger: :class:`x2go.logger.X2GoLogger` instance + :type logger: :class:`x2go.log.X2GoLogger` instance """ fw_socket = socket.socket() diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py index 9a88efe..35d7a19 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -62,9 +62,9 @@ class _SSHServer(paramiko.ServerInterface): :type auth_key: ``paramiko.RSAKey`` instance :param session_instance: the calling :class:`x2go.session.X2GoSession` instance :type session_instance: :class:`x2go.session.X2GoSession` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -168,9 +168,9 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): :type server: ``paramiko.ServerInterface`` instance :param chroot: chroot environment for this SFTP interface :type chroot: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` :param server_event: a ``threading.Event`` instance that can signal SFTP session termination @@ -506,10 +506,10 @@ class X2GoRevFwTunnelToSFTP(rforward.X2GoRevFwTunnel): :param auth_key: Paramiko/SSH RSAkey object that has to be authenticated against by the remote sFTP client :type auth_key: ``paramiko.RSAKey`` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.sftpserver.X2GoRevFwTunnelToSFTP` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -605,7 +605,7 @@ def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None): :param auth_key: Paramiko/SSH RSAkey object that has to be authenticated against by the remote sFTP client (Default value = None) :type auth_key: ``paramiko.RSAKey`` instance - :param logger: you must pass an :class:`x2go.logger.X2GoLogger` object to this handler method (Default value = None) + :param logger: you must pass an :class:`x2go.log.X2GoLogger` object to this handler method (Default value = None) :type logger: ``X2GoLogger`` instance """ diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 1770385..a1cb368 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -141,10 +141,10 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): :type ssh_rootdir: ``str`` :param session_instance: the :class:`x2go.session.X2GoSession` instance that builds up this SSH proxying tunnel :type session_instance: :class:`x2go.session.X2GoSession` instance - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.sshproxy.X2GoSSHProxy` constructor - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: int diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py index f1b988c..9c8c6d2 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -80,12 +80,12 @@ class X2GoTelekinesisClient(threading.Thread): :type ssh_transport: ``paramiko.Transport`` instance :param sessions_rootdir: base dir where X2Go session files are stored (by default: ~/.x2go) :type sessions_rootdir: ``str`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.telekinesis.X2GoTelekinesisClient` constructor :param session_instance: the :class:`x2go.session.X2GoSession` instance this ``X2GoProxy*`` instance belongs to :type session_instance: :class:`x2go.session.X2GoSession` instance - :type logger: :class:`x2go.logger.X2GoLogger` instance - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :type logger: :class:`x2go.log.X2GoLogger` instance + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: int diff --git a/x2go/xserver.py b/x2go/xserver.py index ff27b4c..8e3f8f2 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -75,9 +75,9 @@ class X2GoClientXConfig(inifiles.X2GoIniFile): :type config_files: ``list`` :param defaults: a Python dictionary with configuration file defaults (use on your own risk) :type defaults: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` @@ -288,9 +288,9 @@ class X2GoXServer(threading.Thread): :type xserver_name: ``str`` :param xserver_config: XServer configuration node (as derived from :func:`X2GoClientXConfig.get_xserver_config() <x2go.xserver.X2GoClientXConfig.get_xserver_config()>` :type xserver_config: ``dict`` - :param logger: you can pass an :class:`x2go.logger.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor + :param logger: you can pass an :class:`x2go.log.X2GoLogger` object to the :class:`x2go.xserver.X2GoClientXConfig` constructor :type logger: ``obj`` - :param loglevel: if no :class:`x2go.logger.X2GoLogger` object has been supplied a new one will be + :param loglevel: if no :class:`x2go.log.X2GoLogger` object has been supplied a new one will be constructed with the given loglevel :type loglevel: ``int`` -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git