[X2go-Commits] x2gobroker.git - master (branch) updated: 23f9762174258d904af10acd9f91c195c0f17881

X2Go dev team git-admin at x2go.org
Fri Dec 7 01:24:12 CET 2012


The branch, master has been updated
       via  23f9762174258d904af10acd9f91c195c0f17881 (commit)
       via  f00e0c96a127a8d3fc641363e37aeec0e5719b69 (commit)
      from  248929ec32c01181742830159aed013a880eafca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23f9762174258d904af10acd9f91c195c0f17881
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 7 01:24:10 2012 +0100

    fix backend name in x2gobroker.conf

commit f00e0c96a127a8d3fc641363e37aeec0e5719b69
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 7 01:21:35 2012 +0100

    code cleanup after pyflakes took a look

-----------------------------------------------------------------------

Summary of changes:
 etc/x2gobroker.conf                         |    2 +-
 x2gobroker/backends/base.py                 |    1 -
 x2gobroker/backends/zeroconf.py             |    3 ---
 x2gobroker/config.py                        |    4 ----
 x2gobroker/tests/__init__.py                |    3 ---
 x2gobroker/tests/test_backend_inifile.py    |    2 +-
 x2gobroker/tests/test_backend_zeroconf.py   |    1 -
 x2gobroker/tests/test_web_plain_base.py     |    2 --
 x2gobroker/tests/test_web_plain_zeroconf.py |    4 ----
 9 files changed, 2 insertions(+), 20 deletions(-)

The diff of changes is:
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index 78abacc..7004ee2 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -87,7 +87,7 @@ enable = true
 auth-mech = pam
 desktop-shell = KDE
 
-[singlenodes]
+[inifile]
 enable = false
 auth-mech = pam
 session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf
diff --git a/x2gobroker/backends/base.py b/x2gobroker/backends/base.py
index 93bb288..50be3f1 100644
--- a/x2gobroker/backends/base.py
+++ b/x2gobroker/backends/base.py
@@ -222,7 +222,6 @@ class X2GoBroker(object):
         ### CHECKING on a per-user basis...
 
         _allow_user = False
-        _explicit_allow_user = False
         _deny_user = False
         _explicit_deny_user = False
 
diff --git a/x2gobroker/backends/zeroconf.py b/x2gobroker/backends/zeroconf.py
index b6c8cc1..078b9ca 100644
--- a/x2gobroker/backends/zeroconf.py
+++ b/x2gobroker/backends/zeroconf.py
@@ -25,14 +25,11 @@ X2goBrokerZEROCONF class - a demo X2GoBroker implementations that needs not conf
 __NAME__ = 'x2gobroker-pylib'
 
 # modules
-import subprocess
 import uuid
 
 # Python X2GoBroker modules
 import base
 
-from x2gobroker.defaults import X2GOBROKER_AGENT_CMD as _X2GOBROKER_AGENT_CMD
-
 class X2GoBroker(base.X2GoBroker):
 
     backend_name = 'zeroconf'
diff --git a/x2gobroker/config.py b/x2gobroker/config.py
index 0feded0..a2979ab 100644
--- a/x2gobroker/config.py
+++ b/x2gobroker/config.py
@@ -37,8 +37,6 @@ import cStringIO
 import x2gobroker.utils
 
 from x2gobroker.defaults import X2GOBROKER_HOME as _X2GOBROKER_HOME
-from x2gobroker.defaults import X2GOBROKER_CONFIG as _X2GOBROKER_CONFIG
-from x2gobroker.defaults import X2GOBROKER_CONFIG_DEFAULTS as _X2GOBROKER_CONFIG_DEFAULTS
 
 class X2GoBrokerConfigFile(object):
     """
@@ -78,8 +76,6 @@ class X2GoBrokerConfigFile(object):
 
         if x2gobroker.utils._checkConfigFileDefaults(defaults):
             self.defaultValues = defaults
-        else:
-            self.defaultValues = _X2GOBROKER_CONFIG_DEFAULTS
 
         # we purposefully do not inherit the ConfigParser class
         # here as we do not want to run into name conflicts between
diff --git a/x2gobroker/tests/__init__.py b/x2gobroker/tests/__init__.py
index c4b0dcb..2ae9ac5 100644
--- a/x2gobroker/tests/__init__.py
+++ b/x2gobroker/tests/__init__.py
@@ -17,6 +17,3 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import os
-import sys
-import runalltests
diff --git a/x2gobroker/tests/test_backend_inifile.py b/x2gobroker/tests/test_backend_inifile.py
index 9a92730..b927e46 100644
--- a/x2gobroker/tests/test_backend_inifile.py
+++ b/x2gobroker/tests/test_backend_inifile.py
@@ -203,7 +203,7 @@ acl-users-order = deny-allow
 #        _output = {
 #            'server': 'localhost:22',
 #        }
-        zeroconf_backend = x2gobroker.backends.zeroconf.X2GoBroker()
+#        zeroconf_backend = x2gobroker.backends.zeroconf.X2GoBroker()
 #        self.assertEqual(zeroconf_backend.select_profile('profile_bar'), _output)
 
 
diff --git a/x2gobroker/tests/test_backend_zeroconf.py b/x2gobroker/tests/test_backend_zeroconf.py
index d07899e..5f594eb 100644
--- a/x2gobroker/tests/test_backend_zeroconf.py
+++ b/x2gobroker/tests/test_backend_zeroconf.py
@@ -18,7 +18,6 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import unittest
-import tempfile
 
 # Python X2GoBroker modules
 import x2gobroker.backends.zeroconf
diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py
index 25530c4..cbf166a 100644
--- a/x2gobroker/tests/test_web_plain_base.py
+++ b/x2gobroker/tests/test_web_plain_base.py
@@ -20,9 +20,7 @@
 import unittest
 import tempfile
 from paste.fixture import TestApp
-from paste.request import EnvironHeaders
 from nose.tools import *
-import copy
 
 # Python X2GoBroker modules
 import x2gobroker.backends.base
diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py
index a5c8548..69e36de 100644
--- a/x2gobroker/tests/test_web_plain_zeroconf.py
+++ b/x2gobroker/tests/test_web_plain_zeroconf.py
@@ -20,12 +20,8 @@
 import unittest
 import tempfile
 from paste.fixture import TestApp
-from paste.request import EnvironHeaders
 from nose.tools import *
 
-# remove later, for debugging
-import subprocess
-
 # Python X2GoBroker modules
 import x2gobroker.backends.base
 import x2gobroker.defaults


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list