variety: update to 0.8.11.
This commit is contained in:
parent
d4ddd19930
commit
d523a06381
2 changed files with 3 additions and 39 deletions
|
@ -1,36 +0,0 @@
|
||||||
--- a/jumble/Jumble.py
|
|
||||||
+++ b/jumble/Jumble.py
|
|
||||||
@@ -14,7 +14,8 @@
|
|
||||||
# with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
### END LICENSE
|
|
||||||
|
|
||||||
-import imp
|
|
||||||
+import importlib.util
|
|
||||||
+import sys
|
|
||||||
import inspect
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
@@ -39,13 +40,16 @@
|
|
||||||
for location, f in self._walk_python_files():
|
|
||||||
path = os.path.join(location, f)
|
|
||||||
name = os.path.splitext(f)[0]
|
|
||||||
- info = imp.find_module(name, [location])
|
|
||||||
- try:
|
|
||||||
- logger.info(lambda: "Jumble loading module in %s from %s" % (name, path))
|
|
||||||
- yield imp.load_module(name, *info), path
|
|
||||||
- except Exception:
|
|
||||||
- logger.exception("Could not load plugin module %s" % path)
|
|
||||||
- continue
|
|
||||||
+ if (spec := importlib.util.spec_from_file_location(name, path)) is not None:
|
|
||||||
+ try:
|
|
||||||
+ module = importlib.util.module_from_spec(spec)
|
|
||||||
+ logger.info(lambda: "Jumble loading module in %s from %s" % (name, path))
|
|
||||||
+ sys.modules[name] = module
|
|
||||||
+ spec.loader.exec_module(module)
|
|
||||||
+ yield module, path
|
|
||||||
+ except Exception:
|
|
||||||
+ logger.exception("Could not load plugin module %s" % path)
|
|
||||||
+ continue
|
|
||||||
|
|
||||||
def _walk_plugin_classes(self):
|
|
||||||
for module, path in self._walk_modules():
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'variety'
|
# Template file for 'variety'
|
||||||
pkgname=variety
|
pkgname=variety
|
||||||
version=0.8.10
|
version=0.8.11
|
||||||
revision=3
|
revision=1
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
pycompile_dirs="usr/share/variety/plugins"
|
pycompile_dirs="usr/share/variety/plugins"
|
||||||
hostmakedepends="python3-setuptools python3-distutils-extra intltool"
|
hostmakedepends="python3-setuptools python3-distutils-extra intltool"
|
||||||
|
@ -15,4 +15,4 @@ license="GPL-3.0-only"
|
||||||
homepage="https://peterlevi.com/variety/"
|
homepage="https://peterlevi.com/variety/"
|
||||||
changelog="https://raw.githubusercontent.com/varietywalls/variety/master/data/ui/changes.txt"
|
changelog="https://raw.githubusercontent.com/varietywalls/variety/master/data/ui/changes.txt"
|
||||||
distfiles="https://github.com/varietywalls/variety/archive/${version}.tar.gz"
|
distfiles="https://github.com/varietywalls/variety/archive/${version}.tar.gz"
|
||||||
checksum=9f312571b92032faf1d3eca62f3800a583e5a90b82a68b6dcd18362120fcda6c
|
checksum=de64104cb01e2a2d1f427117293a69041eff0f962010c1813f65c961c0acf28e
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue