summaryrefslogtreecommitdiff
path: root/pygtkcompat/pygtkcompat.py
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2020-04-15 09:51:45 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2020-04-15 09:51:45 +0200
commita6799b242c0abd6a9dfbf1e98742b2b922205ebf (patch)
tree89d3c5330ec4cae28f39c64c6a343caa5b6a868b /pygtkcompat/pygtkcompat.py
parent9cdbc56fbac4db2de78dc080934b8f0a7efc892a (diff)
downloadpygobject-a6799b242c0abd6a9dfbf1e98742b2b922205ebf.tar.gz
Remove all Python 2 Python code
Diffstat (limited to 'pygtkcompat/pygtkcompat.py')
-rw-r--r--pygtkcompat/pygtkcompat.py15
1 files changed, 3 insertions, 12 deletions
diff --git a/pygtkcompat/pygtkcompat.py b/pygtkcompat/pygtkcompat.py
index c9711c68..966b67b6 100644
--- a/pygtkcompat/pygtkcompat.py
+++ b/pygtkcompat/pygtkcompat.py
@@ -34,10 +34,10 @@ a well behaved PyGTK application mostly unmodified on top of PyGI.
import sys
import warnings
+from collections import UserList
import gi
from gi.repository import GObject
-from gi import _compat
_patches = []
@@ -149,10 +149,6 @@ def _disable_all():
sys.modules[name] = old_value
del _module_patches[:]
- _compat.reload(sys)
- if _compat.PY2:
- sys.setdefaultencoding('ascii')
-
def enable_gtk(version='3.0'):
if _check_enabled("gtk", version):
@@ -161,11 +157,6 @@ def enable_gtk(version='3.0'):
if version == "4.0":
raise ValueError("version 4.0 not supported")
- # set the default encoding like PyGTK
- _compat.reload(sys)
- if _compat.PY2:
- sys.setdefaultencoding('utf-8')
-
# atk
gi.require_version('Atk', '1.0')
from gi.repository import Atk
@@ -429,11 +420,11 @@ def enable_gtk(version='3.0'):
orig_size_request = Gtk.Widget.size_request
def size_request(widget):
- class SizeRequest(_compat.UserList):
+ class SizeRequest(UserList):
def __init__(self, req):
self.height = req.height
self.width = req.width
- _compat.UserList.__init__(self, [self.width, self.height])
+ UserList.__init__(self, [self.width, self.height])
return SizeRequest(orig_size_request(widget))
_patch(Gtk.Widget, "size_request", size_request)
_patch(Gtk.Widget, "hide_all", Gtk.Widget.hide)