|
 |
fca856 |
--- pygobject-3.22.0/gi/__init__.py.allow-static-module-import 2016-07-06 08:17:26.000000000 +0200
|
|
|
fca856 |
+++ pygobject-3.22.0/gi/__init__.py 2017-02-08 16:53:17.446776839 +0100
|
|
|
fca856 |
@@ -27,17 +27,12 @@
|
|
|
fca856 |
import sys
|
|
|
fca856 |
import os
|
|
|
fca856 |
import importlib
|
|
|
fca856 |
-import types
|
|
|
fca856 |
-
|
|
|
fca856 |
-_static_binding_error = ('When using gi.repository you must not import static '
|
|
|
fca856 |
- 'modules like "gobject". Please change all occurrences '
|
|
|
fca856 |
- 'of "import gobject" to "from gi.repository import GObject". '
|
|
|
fca856 |
- 'See: https://bugzilla.gnome.org/show_bug.cgi?id=709183')
|
|
|
fca856 |
|
|
|
fca856 |
# we can't have pygobject 2 loaded at the same time we load the internal _gobject
|
|
|
fca856 |
if 'gobject' in sys.modules:
|
|
|
fca856 |
- raise ImportError(_static_binding_error)
|
|
|
fca856 |
-
|
|
|
fca856 |
+ raise ImportError('When using gi.repository you must not import static '
|
|
|
fca856 |
+ 'modules like "gobject". Please change all occurrences '
|
|
|
fca856 |
+ 'of "import gobject" to "from gi.repository import GObject".')
|
|
|
fca856 |
|
|
|
fca856 |
from . import _gi
|
|
|
fca856 |
from ._gi import _gobject
|
|
|
fca856 |
@@ -57,20 +52,6 @@
|
|
|
fca856 |
__version__ = "{0}.{1}.{2}".format(*version_info)
|
|
|
fca856 |
|
|
|
fca856 |
|
|
|
fca856 |
-class _DummyStaticModule(types.ModuleType):
|
|
|
fca856 |
- __path__ = None
|
|
|
fca856 |
-
|
|
|
fca856 |
- def __getattr__(self, name):
|
|
|
fca856 |
- raise AttributeError(_static_binding_error)
|
|
|
fca856 |
-
|
|
|
fca856 |
-
|
|
|
fca856 |
-sys.modules['glib'] = _DummyStaticModule('glib', _static_binding_error)
|
|
|
fca856 |
-sys.modules['gobject'] = _DummyStaticModule('gobject', _static_binding_error)
|
|
|
fca856 |
-sys.modules['gio'] = _DummyStaticModule('gio', _static_binding_error)
|
|
|
fca856 |
-sys.modules['gtk'] = _DummyStaticModule('gtk', _static_binding_error)
|
|
|
fca856 |
-sys.modules['gtk.gdk'] = _DummyStaticModule('gtk.gdk', _static_binding_error)
|
|
|
fca856 |
-
|
|
|
fca856 |
-
|
|
|
fca856 |
def check_version(version):
|
|
|
fca856 |
if isinstance(version, str):
|
|
|
fca856 |
version_list = tuple(map(int, version.split(".")))
|
|
|
fca856 |
--- pygobject-3.22.0/tests/test_import_machinery.py.allow-static-module-import 2016-08-25 16:36:12.000000000 +0200
|
|
|
fca856 |
+++ pygobject-3.22.0/tests/test_import_machinery.py 2017-02-08 16:53:17.473776850 +0100
|
|
|
fca856 |
@@ -90,30 +90,6 @@
|
|
|
fca856 |
self.assertIn('gi.repository.Gio', sys.modules)
|
|
|
fca856 |
self.assertIn('gi.repository.GIMarshallingTests', sys.modules)
|
|
|
fca856 |
|
|
|
fca856 |
- def test_static_binding_protection(self):
|
|
|
fca856 |
- # Importing old static bindings once gi has been imported should not
|
|
|
fca856 |
- # crash but instead give back a dummy module which produces RuntimeErrors
|
|
|
fca856 |
- # on access.
|
|
|
fca856 |
- with self.assertRaises(AttributeError):
|
|
|
fca856 |
- import gobject
|
|
|
fca856 |
- gobject.anything
|
|
|
fca856 |
-
|
|
|
fca856 |
- with self.assertRaises(AttributeError):
|
|
|
fca856 |
- import glib
|
|
|
fca856 |
- glib.anything
|
|
|
fca856 |
-
|
|
|
fca856 |
- with self.assertRaises(AttributeError):
|
|
|
fca856 |
- import gio
|
|
|
fca856 |
- gio.anything
|
|
|
fca856 |
-
|
|
|
fca856 |
- with self.assertRaises(AttributeError):
|
|
|
fca856 |
- import gtk
|
|
|
fca856 |
- gtk.anything
|
|
|
fca856 |
-
|
|
|
fca856 |
- with self.assertRaises(AttributeError):
|
|
|
fca856 |
- import gtk.gdk
|
|
|
fca856 |
- gtk.gdk.anything
|
|
|
fca856 |
-
|
|
|
fca856 |
|
|
|
fca856 |
class TestImporter(unittest.TestCase):
|
|
|
fca856 |
def test_invalid_repository_module_name(self):
|