From b207c4d48b0b9f4014d14d79498eb73c1e4a737e Mon Sep 17 00:00:00 2001 From: spoob Date: Wed, 3 Feb 2010 22:55:25 +0100 Subject: better DLC Support for Python 2.5 and 2.6 --- module/plugins/container/DLC.pyc | Bin 5923 -> 0 bytes module/plugins/container/DLC_25.pyc | Bin 0 -> 5910 bytes module/plugins/container/DLC_26.pyc | Bin 0 -> 6162 bytes pyLoadCore.py | 8 ++++++-- 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 module/plugins/container/DLC.pyc create mode 100644 module/plugins/container/DLC_25.pyc create mode 100644 module/plugins/container/DLC_26.pyc diff --git a/module/plugins/container/DLC.pyc b/module/plugins/container/DLC.pyc deleted file mode 100644 index 14d5d39a4..000000000 Binary files a/module/plugins/container/DLC.pyc and /dev/null differ diff --git a/module/plugins/container/DLC_25.pyc b/module/plugins/container/DLC_25.pyc new file mode 100644 index 000000000..e05ef78a2 Binary files /dev/null and b/module/plugins/container/DLC_25.pyc differ diff --git a/module/plugins/container/DLC_26.pyc b/module/plugins/container/DLC_26.pyc new file mode 100644 index 000000000..29f77a9c3 Binary files /dev/null and b/module/plugins/container/DLC_26.pyc differ diff --git a/pyLoadCore.py b/pyLoadCore.py index 1047273d6..39ea4727f 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -289,11 +289,15 @@ class Core(object): plugins = glob(join(self.plugin_folder, "hoster", "*.py")) plugins += glob(join(self.plugin_folder, "decrypter", "*.py")) plugins += glob(join(self.plugin_folder, "container", "*.py")) - plugins += glob(join(self.plugin_folder, "container", "DLC.pyc")) + plugins += glob(join(self.plugin_folder, "container", "DLC_*.pyc")) for file_handler in plugins: plugin_pattern = "" plugin_file = sub("(\.pyc|\.py)", "", basename(file_handler)) - if plugin_file == "DLC": + if plugin_file.startswith("DLC"): + if plugin_file == "DLC_25" and not version_info < (2, 6): + continue + if plugin_file == "DLC_26" and not version_info > (2, 6): + continue plugin_pattern = "(?!http://).*\.dlc" else: for line in open(file_handler, "r").readlines(): -- cgit v1.2.3