pyqttoolkit 0.7.33__tar.gz → 0.8.0__tar.gz

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.33
+Version: 0.8.0
 Summary: A toolkit for PyQt 5
-Home-page: https://github.com/Simmovation/pyqttoolkit
-Author: Simmovation Ltd
-Author-email: info@simmovation.tech
+Home-page: https://github.com/BitBloomTech/pyqttoolkit
+Author: Bitbloom Ltd
+Author-email: info@bitbloom.tech
 License: GPLv3
 Description: # PyQtToolkit
         
@@ -12,5 +12,6 @@ Description: # PyQtToolkit
 Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: publish
+Provides-Extra: ui
 Provides-Extra: test
+Provides-Extra: publish

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/pyqttoolkit/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-19T13:50:57+0100",
+ "date": "2025-01-31T13:58:07+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "2d7b0cb04ba79e391600d50e7a3992a22cb4db0b",
- "version": "0.7.33"
+ "full-revisionid": "5aabc612771d5bc0895e0f0378db95785f5d4a0f",
+ "version": "0.8.0"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/pyqttoolkit/scripting/script_runner.py

@@ -80,21 +80,24 @@ class ScriptRunner:
             self._context = None
         
     def _globals(self, context):
-        return {'__builtins__': {**__builtins__, '__import__': self._import, 'exit': self._exit, **{g: self._not_implemented for g in self._disallowed_globals}}}
+        return {'__builtins__': {**__builtins__, '__import__': self._import(builtins.__import__), 'exit': self._exit, **{g: self._not_implemented for g in self._disallowed_globals}}}
 
     def compile(self, script):
         return compile(script, 'code', 'exec')
     
-    def _import(self, module_name, *args, **kwargs):
-        if any(re.match(m, module_name) for m in self._disallowed_modules):
-            raise ImportError('Module not found')
-        try:
-                
-            with add_paths(self._additional_paths):
-                module = builtins.__import__(module_name, *args, **kwargs)
-            return module
-        except KeyError:
-            raise ImportError('Module not found')
+    def _import(self, import_function):
+        def _(module_name, *args, **kwargs):
+            if any(re.match(m, module_name) for m in self._disallowed_modules):
+                raise ImportError('Module not found')
+            try:
+                with add_paths(self._additional_paths):
+                    module = import_function(module_name, *args, **kwargs)
+                if module_name in 'importlib':
+                    module.import_module = self._import(importlib.import_module)
+                return module
+            except KeyError:
+                raise ImportError('Module not found')
+        return _
     
     def _additional_paths(self):
         return self._additional_paths

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/pyqttoolkit.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.33
+Version: 0.8.0
 Summary: A toolkit for PyQt 5
-Home-page: https://github.com/Simmovation/pyqttoolkit
-Author: Simmovation Ltd
-Author-email: info@simmovation.tech
+Home-page: https://github.com/BitBloomTech/pyqttoolkit
+Author: Bitbloom Ltd
+Author-email: info@bitbloom.tech
 License: GPLv3
 Description: # PyQtToolkit
         
@@ -12,5 +12,6 @@ Description: # PyQtToolkit
 Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: publish
+Provides-Extra: ui
 Provides-Extra: test
+Provides-Extra: publish

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/pyqttoolkit.egg-info/requires.txt

@@ -1,4 +1,3 @@
-pyQt5
 matplotlib
 jinja2
 pandas
@@ -15,3 +14,6 @@ pytest-xvfb
 pytest-asyncio
 pytest-qt
 licensify
+
+[ui]
+pyqt5

{pyqttoolkit-0.7.33 → pyqttoolkit-0.8.0}/setup.py

@@ -11,7 +11,6 @@ with open(path.join(_here, 'README.md')) as fp:
     README_CONTENTS = fp.read()
 
 install_requires = [
-    'pyQt5',
     'matplotlib',
     'jinja2',
     'pandas',
@@ -30,7 +29,8 @@ tests_require = [
 
 extras_require = {
     'test': tests_require,
-    'publish': ['twine']
+    'publish': ['twine'],
+    'ui': ['pyqt5']
 }
 
 setup(
@@ -42,9 +42,9 @@ setup(
     cmdclass=versioneer.get_cmdclass(),
     license='GPLv3',
     version=versioneer.get_version(),
-    author='Simmovation Ltd',
-    author_email='info@simmovation.tech',
-    url='https://github.com/Simmovation/pyqttoolkit',
+    author='Bitbloom Ltd',
+    author_email='info@bitbloom.tech',
+    url='https://github.com/BitBloomTech/pyqttoolkit',
     platforms='any',
     description='A toolkit for PyQt 5',
     long_description=README_CONTENTS,