summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-10 17:22:14 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-10 17:22:14 +0200
commitfcdcab9b14026f2eaf54efd0aa2ff882effe13ae (patch)
tree2af6bd392d4dd6367c00864d03ee97d2563c5c9e /module/plugins
parentSpare code cosmetics (2) (diff)
parentUpdate Base.py (diff)
downloadpyload-fcdcab9b14026f2eaf54efd0aa2ff882effe13ae.tar.xz
Merge branch 'pr/n1997_GammaC0de' into stable
Conflicts: module/plugins/internal/Base.py
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/internal/Base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py
index c2f3a6e98..e3aaf202b 100644
--- a/module/plugins/internal/Base.py
+++ b/module/plugins/internal/Base.py
@@ -3,6 +3,7 @@
import inspect
import mimetypes
import os
+import re
import time
import urlparse
@@ -46,7 +47,7 @@ def check_abort(fn):
class Base(Plugin):
__name__ = "Base"
__type__ = "base"
- __version__ = "0.10"
+ __version__ = "0.11"
__status__ = "testing"
__pattern__ = r'^unmatchable$'