[X2Go-Commits] [python-x2go] 05/07: InstanceType does not exist in Python3. Let's omit it in __repr__ method.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 90db1590fd2c5be360098e1e513a791a6dd082d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 16:24:56 2018 +0000

    InstanceType does not exist in Python3. Let's omit it in __repr__ method.
---
 x2go/backends/info/plain.py | 2 +-
 x2go/inifiles.py            | 2 +-
 x2go/registry.py            | 2 +-
 x2go/session.py             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x2go/backends/info/plain.py b/x2go/backends/info/plain.py
index cc32fbe..e173036 100644
--- a/x2go/backends/info/plain.py
+++ b/x2go/backends/info/plain.py
@@ -49,7 +49,7 @@ class X2GoServerSessionInfo(object):
     def __repr__(self):
         result = 'X2GoServerSessionInfo('
         for p in dir(self):
-            if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
+            if '__' in p or not p in self.__dict__: continue
             result += p + '=' + str(self.__dict__[p]) +','
         return result.strip(',') + ')'
 
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index f2c5928..f549d5c 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -139,7 +139,7 @@ class X2GoIniFile(object):
     def __repr__(self):
         result = 'X2GoIniFile('
         for p in dir(self):
-            if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
+            if '__' in p or not p in self.__dict__: continue
             result += p + '=' + str(self.__dict__[p]) + ','
         result = result.strip(',')
         return result + ')'
diff --git a/x2go/registry.py b/x2go/registry.py
index d8a17cc..bfaf974 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -97,7 +97,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 types.InstanceType: continue
+            if '__' in p or not p in self.__dict__: continue
             result += p + '=' + str(self.__dict__[p]) + ','
         result = result.strip(',')
         return result + ')'
diff --git a/x2go/session.py b/x2go/session.py
index 63e2b85..99f6b1c 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -375,7 +375,7 @@ class X2GoSession(object):
     def __repr__(self):
         result = 'X2GoSession('
         for p in dir(self):
-            if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
+            if '__' in p or not p in self.__dict__: continue
             result += p + '=' + str(self.__dict__[p]) + ','
         result = result.strip(',')
         return result + ')'

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git