devol
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2244 from dalf/fix-drop-python2 

Fix drop python2
This commit is contained in:
Alexandre Flament 2020-10-07 10:11:53 +02:00 committed by GitHub
parent 584760cf54 8659212f5a
commit 66bda23895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/engines/json_engine.py
View File

@ -1,4 +1,4 @@
from collections import Iterable from collections.abc import Iterable
from json import loads from json import loads
from urllib.parse import urlencode from urllib.parse import urlencode
from searx.utils import to_string from searx.utils import to_string

9
searx/utils.py
View File

@ -3,8 +3,8 @@ import os
import sys import sys
import re import re
import json import json
import importlib
from imp import load_source
from numbers import Number from numbers import Number
from os.path import splitext, join from os.path import splitext, join
from io import open from io import open
@ -445,8 +445,11 @@ def load_module(filename, module_dir):
if modname in sys.modules: if modname in sys.modules:
del sys.modules[modname] del sys.modules[modname]
filepath = join(module_dir, filename) filepath = join(module_dir, filename)
module = load_source(modname, filepath) # and https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
module.name = modname spec = importlib.util.spec_from_file_location(modname, filepath)
module = importlib.util.module_from_spec(spec)
sys.modules[modname] = module
spec.loader.exec_module(module)
return module return module