[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 4bc5bfc1358b525e7b36fbe97264957be0a9fbef
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:08 CET 2014
The branch, build-baikal has been updated
via 4bc5bfc1358b525e7b36fbe97264957be0a9fbef (commit)
from eff06124e17bf39b855097080cc6a851ba8fff46 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/__init__.py | 3 +++
x2go/inifiles.py | 3 ++-
x2go/registry.py | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/__init__.py b/x2go/__init__.py
index ebf297a..ddfb2f7 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -47,6 +47,9 @@ _signal.signal (_signal.SIGTERM, guardian._sigterm_handle )
_signal.signal (_signal.SIGINT, guardian._sigterm_handle )
from client import X2goClient
+from profiles import X2goSessionProfiles
+from printing import X2goClientPrinting
+from settings import X2goClientSettings
from x2go_exceptions import *
from log import *
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index fead74c..2d149e4 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -96,13 +96,14 @@ class X2goIniFile(object):
self.user_config_file = file_name
break
+ self.config_files = _found_config_files
self._fill_defaults()
self._updateDataObject()
def __repr__(self):
result = 'X2goIniFile('
for p in dir(self):
- if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue
+ if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p])
return result + ')'
diff --git a/x2go/registry.py b/x2go/registry.py
index cb2e178..72f3c58 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -68,7 +68,7 @@ class X2goSessionRegistry(object):
def __repr__(self):
result = 'X2goSessionRegistry('
for p in dir(self):
- if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue
+ if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p])
return result + ')'
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list