summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/container
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-22 17:06:38 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-22 17:06:38 +0100
commit38995b29744a0a4101a3b26c53f5f0a60b30bda4 (patch)
tree0a6d7d06bb4cddead1ac7416c19331db917b38e4 /pyload/plugin/container
parentTiny code cosmetics (diff)
parent[HotFolder] Fixup (thx zapp-brannigan) (diff)
downloadpyload-38995b29744a0a4101a3b26c53f5f0a60b30bda4.tar.xz
Merge branch 'stable' into 0.4.10
Conflicts: module/plugins/container/LinkList.py module/plugins/container/TXT.py module/plugins/hoster/HundredEightyUploadCom.py pyload/plugin/Extractor.py pyload/plugin/addon/ClickAndLoad.py pyload/plugin/addon/ExtractArchive.py pyload/plugin/addon/HotFolder.py pyload/plugin/container/TXT.py pyload/plugin/extractor/SevenZip.py pyload/plugin/extractor/UnRar.py pyload/plugin/extractor/UnZip.py pyload/plugin/hook/XFileSharingPro.py pyload/plugin/hoster/ZippyshareCom.py
Diffstat (limited to 'pyload/plugin/container')
-rw-r--r--pyload/plugin/container/TXT.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyload/plugin/container/TXT.py b/pyload/plugin/container/TXT.py
index 0f90f6b5a..31560f165 100644
--- a/pyload/plugin/container/TXT.py
+++ b/pyload/plugin/container/TXT.py
@@ -12,13 +12,13 @@ class TXT(Container):
__version = "0.15"
__pattern = r'.+\.(txt|text)$'
- __config = [("flush" , "bool" , "Flush list after adding", False ),
- ("encoding", "string", "File encoding" , "utf-8")]
+ __config = [("flush" , "bool" , "Flush list after adding", False ),
+ ("encoding", "string", "File encoding" , "utf-8")]
__description = """Read link lists in plain text formats"""
__license = "GPLv3"
__authors = [("spoob", "spoob@pyload.org"),
- ("jeix", "jeix@hasnomail.com")]
+ ("jeix", "jeix@hasnomail.com")]
def decrypt(self, pyfile):