Merge pull request #176 from ingolemo/master

vasily-v-ryabov · web-flow · commit b79d2db55e5b · 2020-11-22T13:55:47.000+02:00
Fix __repr__s
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -1320,7 +1320,7 @@ def __str__(self):
         return str(self._data)
 
     def __repr__(self):
-        return '%s(%s)' % (self.__class__, repr(self._data))
+        return '%s(%s)' % (self.__class__.__name__, repr(self._data))
 
     def __lt__(self, other):
         if isinstance(other, DictWrapper):
@@ -1400,7 +1400,7 @@ def _set_error(self, error):
         return 1
 
     def __repr__(self):
-        return '<%s serial = %s, data = %s, error = %s>' % (self.__class__, self._serial, self._data, self._error)
+        return '<%s serial = %s, data = %s, error = %s>' % (self.__class__.__name__, self._serial, self._data, self._error)
 
 
 class Event(GetAttrData):
@@ -1434,7 +1434,7 @@ def __repr__(self):
             kwlist.append('%s = %s' % (kw, repr(val)))
 
         kws = ', '.join(kwlist)
-        return '%s(%s)' % (self.__class__, kws)
+        return '%s(%s)' % (self.__class__.__name__, kws)
 
     def __lt__(self, other):
         if isinstance(other, Event):
diff --git a/Xlib/xobject/resource.py b/Xlib/xobject/resource.py
@@ -45,11 +45,8 @@ def __ne__(self, obj):
     def __hash__(self):
         return int(self.id)
 
-    def __str__(self):
-        return '%s(0x%08x)' % (self.__class__, self.id)
-
     def __repr__(self):
-        return '<%s 0x%08x>' % (self.__class__, self.id)
+        return '<%s 0x%08x>' % (self.__class__.__name__, self.id)
 
     def kill_client(self, onerror = None):
         request.KillClient(display = self.display,
