This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 118f0143a13ca72f5bf63f1f57cd17544a15cd1e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 18 16:23:16 2018 +0000 x2go/*.py: Drop 'from builtins import <bla>'. Not required. --- x2go/_paramiko.py | 1 - x2go/backends/control/plain.py | 2 -- x2go/backends/info/plain.py | 2 -- x2go/backends/printing/file.py | 1 - x2go/backends/profiles/base.py | 2 -- x2go/backends/profiles/httpbroker.py | 1 - x2go/backends/proxy/base.py | 1 - x2go/backends/terminal/plain.py | 2 -- x2go/cache.py | 2 -- x2go/checkhosts.py | 2 -- x2go/client.py | 2 -- x2go/defaults.py | 2 -- x2go/gevent_subprocess.py | 1 - x2go/inifiles.py | 2 -- x2go/log.py | 1 - x2go/mimeboxactions.py | 2 -- x2go/printactions.py | 2 -- x2go/registry.py | 2 -- x2go/rforward.py | 1 - x2go/session.py | 2 -- x2go/sftpserver.py | 1 - x2go/sshproxy.py | 2 -- x2go/telekinesis.py | 1 - x2go/utils.py | 3 --- x2go/xserver.py | 1 - 25 files changed, 41 deletions(-) diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index 0fec247..c66ba94 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -21,7 +21,6 @@ Monkey Patch and feature map for Python Paramiko """ -from builtins import str __package__ = 'x2go' __name__ = 'x2go._paramiko' diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 53bb25c..104a25b 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -23,8 +23,6 @@ This backend handles X2Go server implementations that respond via server-side PLAIN text output. """ -from builtins import str -from builtins import range __NAME__ = 'x2gocontrolsession-pylib' __package__ = 'x2go.backends.control' diff --git a/x2go/backends/info/plain.py b/x2go/backends/info/plain.py index b01bb59..cc32fbe 100644 --- a/x2go/backends/info/plain.py +++ b/x2go/backends/info/plain.py @@ -27,8 +27,6 @@ via server-side PLAIN text output. """ from __future__ import print_function -from builtins import str -from builtins import object __NAME__ = 'x2goserversessioninfo-pylib' __package__ = 'x2go.backends.info' diff --git a/x2go/backends/printing/file.py b/x2go/backends/printing/file.py index d16c613..cc486a4 100644 --- a/x2go/backends/printing/file.py +++ b/x2go/backends/printing/file.py @@ -26,7 +26,6 @@ Use this class in your Python X2Go based applications to access the »printing« configuration of your X2Go client application. """ -from builtins import str __NAME__ = 'x2goprinting-pylib' __package__ = 'x2go.backends.printing' diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 2b46ef3..37f4ed6 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -24,8 +24,6 @@ applications. """ -from builtins import str -from builtins import object __NAME__ = 'x2gosessionprofiles-pylib' __package__ = 'x2go.backends.profiles' diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py index 30e8105..e52567e 100644 --- a/x2go/backends/profiles/httpbroker.py +++ b/x2go/backends/profiles/httpbroker.py @@ -25,7 +25,6 @@ applications. """ from __future__ import print_function -from builtins import str __NAME__ = 'x2gosessionprofiles-pylib' __package__ = 'x2go.backends.profiles' diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 828f04e..424f761 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -21,7 +21,6 @@ X2GoProxy class - proxying your connection through NX3 and others. """ -from builtins import str __NAME__ = 'x2goproxy-pylib' __package__ = 'x2go.backends.proxy' diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py index 217cc5d..df143d0 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -24,8 +24,6 @@ This backend handles X2Go server implementations that respond with session infos via server-side PLAIN text output. """ -from builtins import str -from builtins import object __NAME__ = 'x2goterminalsession-pylib' __package__ = 'x2go.backends.terminal' diff --git a/x2go/cache.py b/x2go/cache.py index 2d5298e..ded8740 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -21,8 +21,6 @@ X2GoListSessionCache class - caching X2Go session information. """ -from builtins import str -from builtins import object __NAME__ = 'x2gocache-pylib' __package__ = 'x2go' diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 293037a..f0a0130 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -21,8 +21,6 @@ Providing mechanisms to ``X2GoControlSession*`` backends for checking host validity. """ -from builtins import str -from builtins import range __NAME__ = 'x2gocheckhosts-pylib' __package__ = 'x2go' diff --git a/x2go/client.py b/x2go/client.py index 6ffb562..7d87c5d 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -119,8 +119,6 @@ Session Suspending / Terminating x2go_client.terminate_session(x2go_sess_uuid) """ -from builtins import str -from builtins import object __NAME__ = 'x2goclient-pylib' __package__ = 'x2go' diff --git a/x2go/defaults.py b/x2go/defaults.py index 0cf2d41..16de520 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -21,8 +21,6 @@ Default variables and values for Python X2Go. """ -from builtins import str -from builtins import range __NAME__ = 'x2godefaults-pylib' __package__ = 'x2go' diff --git a/x2go/gevent_subprocess.py b/x2go/gevent_subprocess.py index 821471a..d27ca84 100644 --- a/x2go/gevent_subprocess.py +++ b/x2go/gevent_subprocess.py @@ -41,7 +41,6 @@ __name__ = 'x2go.gevent_subprocess' """Implementation of the standard :mod:`subprocess` module that spawns greenlets""" -from builtins import object import errno import sys import fcntl, os diff --git a/x2go/inifiles.py b/x2go/inifiles.py index c4de620..7531ef0 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -28,8 +28,6 @@ X2GoProcessIniFile - helper class for parsing .ini files """ from __future__ import print_function -from builtins import str -from builtins import object __NAME__ = 'x2goinifiles-pylib' __package__ = 'x2go' diff --git a/x2go/log.py b/x2go/log.py index 7c8e89f..2b00019 100644 --- a/x2go/log.py +++ b/x2go/log.py @@ -21,7 +21,6 @@ X2GoLogger class - flexible handling of log and debug output. """ -from builtins import object __NAME__ = 'x2gologger-pylib' __package__ = 'x2go' diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 24fe431..32db8f8 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -22,8 +22,6 @@ For MIME box jobs there are currently three handling actions available: :class:`x2go.mimeboxactions.X2GoMIMEboxActionOPEN`, :class:`x2go.mimeboxactions.X2GoMIMEboxActionOPENWITH` and :class:`x2go.mimeboxactions.X2GoMIMEboxActionSAVEAS`. """ -from builtins import str -from builtins import object __NAME__ = 'x2gomimeboxactions-pylib' __package__ = 'x2go' diff --git a/x2go/printactions.py b/x2go/printactions.py index 027f0e0..2ba292e 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -25,8 +25,6 @@ over to a custom (print) command. This is defined by four print action classes :class:`x2go.printactions.X2GoPrintActionPRINTCMD`). """ -from builtins import str -from builtins import object __NAME__ = 'x2goprintactions-pylib' __package__ = 'x2go' diff --git a/x2go/registry.py b/x2go/registry.py index 7f4b3d8..d8a17cc 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -21,8 +21,6 @@ X2GoSessionRegistry class - the X2GoClient's session registry backend """ -from builtins import str -from builtins import object __NAME__ = 'x2gosessregistry-pylib' __package__ = 'x2go' diff --git a/x2go/rforward.py b/x2go/rforward.py index 379b20a..c21f117 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -21,7 +21,6 @@ X2Go sshfs for folder sharing and mounting remote devices in X2Go terminal server sessions. """ -from builtins import str __NAME__ = 'x2gorevtunnel-pylib' __package__ = 'x2go' diff --git a/x2go/session.py b/x2go/session.py index 7a978ad..63e2b85 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -46,8 +46,6 @@ simple steps::
while True: gevent.sleep(1)
""" -from builtins import str -from builtins import object __NAME__ = 'x2gosession-pylib' diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py index 35d7a19..916c6d5 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -29,7 +29,6 @@ The Python X2Go sFTP server code was originally written by Richard Murri, for further information see his website: http://www.richardmurri.com """ -from builtins import str __NAME__ = "x2gosftpserver-pylib" __package__ = 'x2go' diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index a1cb368..2e03c01 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -22,8 +22,6 @@ """ from __future__ import print_function -from builtins import str -from builtins import range __NAME__ = 'x2gosshproxy-pylib' __package__ = 'x2go' diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py index 9c8c6d2..0f131f4 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -21,7 +21,6 @@ X2GoTelekinesisClient class - Connect to Telekinesis Server on X2Go Server. """ -from builtins import str __NAME__ = 'x2gotelekinesisclient-pylib' __package__ = 'x2go' diff --git a/x2go/utils.py b/x2go/utils.py index f873546..c30d2a9 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -21,9 +21,6 @@ Python X2Go helper functions, constants etc. """ -from builtins import str -from builtins import range -from builtins import object __NAME__ = 'x2goutils-pylib' __package__ = 'x2go' diff --git a/x2go/xserver.py b/x2go/xserver.py index 8e3f8f2..3454b40 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -1,4 +1,3 @@ -from builtins import str # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git