X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=robots.py;h=1571d58e2af9b3b63c3e3ed1f0cd5bd7d1651e07;hb=0478809ea1e8ae324e324e99cbb2e25bd0bf31b3;hp=84a3a2bcac5069158e5acd243629d5305c145b9b;hpb=90f66cf9ebfa461d9c1d3163d69f345b20fb8d03;p=bookmarks_db.git diff --git a/robots.py b/robots.py index 84a3a2b..1571d58 100644 --- a/robots.py +++ b/robots.py @@ -11,6 +11,7 @@ __license__ = "GNU GPL" __all__ = ['import_robot', 'robot'] +import sys from os import environ from bkmk_objects import parse_params, set_params @@ -18,9 +19,12 @@ robot_name, robot_params = parse_params(environ.get("BKMK_ROBOT", "forking")) def import_robot(robot_name): - exec("from Robots import bkmk_r%s" % robot_name) - exec("robot = bkmk_r%s.robot_%s" % (robot_name, robot_name)) - return robot + if (robot_name == 'urllib') and (sys.version_info[0] >= 3): + robot_name = 'urllib_py3' + ns = locals() + exec("from Robots import bkmk_r%s" % robot_name, globals(), ns) + exec("robot = bkmk_r%s.robot_%s" % (robot_name, robot_name), globals(), ns) + return ns['robot'] robot = import_robot(robot_name)