summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-19 18:02:35 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-19 18:04:05 +0200
commitbbaac34ea11bf6ffa347a3b1a2effe2b4891fddc (patch)
tree6661a83723bb713ec45aa638d1b2adb23a9dd207
parentrange -> xrange (diff)
downloadpyload-bbaac34ea11bf6ffa347a3b1a2effe2b4891fddc.tar.xz
Spare code cosmetics (6)
-rw-r--r--pyload/api/types.py1
-rw-r--r--pyload/cli/Handler.py1
-rw-r--r--pyload/network/Browser.py6
-rw-r--r--pyload/network/HTTPChunk.py3
-rw-r--r--pyload/plugin/crypter/DevhostSt.py2
-rw-r--r--pyload/plugin/hoster/CzshareCom.py2
-rw-r--r--pyload/plugin/hoster/DataHu.py2
-rw-r--r--pyload/plugin/hoster/FileomCom.py2
-rw-r--r--pyload/plugin/hoster/FilepupNet.py4
-rw-r--r--pyload/plugin/hoster/FilerNet.py4
-rw-r--r--pyload/plugin/hoster/GooIm.py2
-rw-r--r--pyload/plugin/hoster/LetitbitNet.py4
-rw-r--r--pyload/plugin/hoster/LoadTo.py4
-rw-r--r--pyload/plugin/hoster/NovafileCom.py4
-rw-r--r--pyload/plugin/hoster/OboomCom.py2
-rw-r--r--pyload/plugin/hoster/RemixshareCom.py8
-rw-r--r--pyload/plugin/hoster/SolidfilesCom.py2
-rw-r--r--pyload/plugin/hoster/SpeedyshareCom.py2
-rw-r--r--pyload/plugin/hoster/UploadheroCom.py2
-rw-r--r--pyload/plugin/hoster/VidPlayNet.py2
-rw-r--r--pyload/webui/filters.py1
21 files changed, 31 insertions, 29 deletions
diff --git a/pyload/api/types.py b/pyload/api/types.py
index 2fd089333..9381df3c7 100644
--- a/pyload/api/types.py
+++ b/pyload/api/types.py
@@ -2,7 +2,6 @@
# Autogenerated by pyload
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
class BaseObject(object):
__slots__ = []
diff --git a/pyload/cli/Handler.py b/pyload/cli/Handler.py
index 444d7f6d0..33e5dd8e6 100644
--- a/pyload/cli/Handler.py
+++ b/pyload/cli/Handler.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
# @author: RaNaN
-
class Handler(object):
def __init__(self, cli):
diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py
index d8617fabc..a499336c3 100644
--- a/pyload/network/Browser.py
+++ b/pyload/network/Browser.py
@@ -124,7 +124,8 @@ class Browser(object):
def removeAuth(self):
- if "auth" in self.options: del self.options['auth']
+ if "auth" in self.options:
+ del self.options['auth']
self.renewHTTPRequest()
@@ -134,7 +135,8 @@ class Browser(object):
def deleteOption(self, name):
- if name in self.options: del self.options[name]
+ if name in self.options:
+ del self.options[name]
def clearHeaders(self):
diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py
index aaf29355e..86c88fe8e 100644
--- a/pyload/network/HTTPChunk.py
+++ b/pyload/network/HTTPChunk.py
@@ -310,7 +310,8 @@ class HTTPChunk(HTTPRequest):
""" closes everything, unusable after this """
if self.fp: self.fp.close()
self.c.close()
- if hasattr(self, "p"): del self.p
+ if hasattr(self, "p"):
+ del self.p
def charEnc(enc):
diff --git a/pyload/plugin/crypter/DevhostSt.py b/pyload/plugin/crypter/DevhostSt.py
index 4fb82e0ad..46d33885f 100644
--- a/pyload/plugin/crypter/DevhostSt.py
+++ b/pyload/plugin/crypter/DevhostSt.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://d-h.st/users/shine/?fld_id=37263#files
+# http://d-h.st/users/shine/?fld_id=37263#files
import re
diff --git a/pyload/plugin/hoster/CzshareCom.py b/pyload/plugin/hoster/CzshareCom.py
index da9aa68d5..9926c8d74 100644
--- a/pyload/plugin/hoster/CzshareCom.py
+++ b/pyload/plugin/hoster/CzshareCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://czshare.com/5278880/random.bin
+# http://czshare.com/5278880/random.bin
import re
diff --git a/pyload/plugin/hoster/DataHu.py b/pyload/plugin/hoster/DataHu.py
index 1f44e62e5..ba3576d10 100644
--- a/pyload/plugin/hoster/DataHu.py
+++ b/pyload/plugin/hoster/DataHu.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://data.hu/get/6381232/random.bin
+# http://data.hu/get/6381232/random.bin
import re
diff --git a/pyload/plugin/hoster/FileomCom.py b/pyload/plugin/hoster/FileomCom.py
index bac912c56..b01b34db0 100644
--- a/pyload/plugin/hoster/FileomCom.py
+++ b/pyload/plugin/hoster/FileomCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://fileom.com/gycaytyzdw3g/random.bin.html
+# http://fileom.com/gycaytyzdw3g/random.bin.html
from pyload.plugin.internal.XFSHoster import XFSHoster
diff --git a/pyload/plugin/hoster/FilepupNet.py b/pyload/plugin/hoster/FilepupNet.py
index 72237285c..91d640e00 100644
--- a/pyload/plugin/hoster/FilepupNet.py
+++ b/pyload/plugin/hoster/FilepupNet.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://www.filepup.net/files/k5w4ZVoF1410184283.html
-# http://www.filepup.net/files/R4GBq9XH1410186553.html
+# http://www.filepup.net/files/k5w4ZVoF1410184283.html
+# http://www.filepup.net/files/R4GBq9XH1410186553.html
import re
diff --git a/pyload/plugin/hoster/FilerNet.py b/pyload/plugin/hoster/FilerNet.py
index 86a5809da..fbefba8db 100644
--- a/pyload/plugin/hoster/FilerNet.py
+++ b/pyload/plugin/hoster/FilerNet.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://filer.net/get/ivgf5ztw53et3ogd
-# http://filer.net/get/hgo14gzcng3scbvv
+# http://filer.net/get/ivgf5ztw53et3ogd
+# http://filer.net/get/hgo14gzcng3scbvv
import pycurl
import re
diff --git a/pyload/plugin/hoster/GooIm.py b/pyload/plugin/hoster/GooIm.py
index 8fd958660..322dd6101 100644
--- a/pyload/plugin/hoster/GooIm.py
+++ b/pyload/plugin/hoster/GooIm.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# https://goo.im/devs/liquidsmooth/3.x/codina/Nightly/LS-KK-v3.2-2014-08-01-codina.zip
+# https://goo.im/devs/liquidsmooth/3.x/codina/Nightly/LS-KK-v3.2-2014-08-01-codina.zip
import re
diff --git a/pyload/plugin/hoster/LetitbitNet.py b/pyload/plugin/hoster/LetitbitNet.py
index 0cfc225e4..35f5f9cf4 100644
--- a/pyload/plugin/hoster/LetitbitNet.py
+++ b/pyload/plugin/hoster/LetitbitNet.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
#
# API Documentation:
-# http://api.letitbit.net/reg/static/api.pdf
+# http://api.letitbit.net/reg/static/api.pdf
#
# Test links:
-# http://letitbit.net/download/07874.0b5709a7d3beee2408bb1f2eefce/random.bin.html
+# http://letitbit.net/download/07874.0b5709a7d3beee2408bb1f2eefce/random.bin.html
import re
diff --git a/pyload/plugin/hoster/LoadTo.py b/pyload/plugin/hoster/LoadTo.py
index 0b4d40fe9..3a625dbe3 100644
--- a/pyload/plugin/hoster/LoadTo.py
+++ b/pyload/plugin/hoster/LoadTo.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://www.load.to/JWydcofUY6/random.bin
-# http://www.load.to/oeSmrfkXE/random100.bin
+# http://www.load.to/JWydcofUY6/random.bin
+# http://www.load.to/oeSmrfkXE/random100.bin
import re
diff --git a/pyload/plugin/hoster/NovafileCom.py b/pyload/plugin/hoster/NovafileCom.py
index 82f92959b..f76d77269 100644
--- a/pyload/plugin/hoster/NovafileCom.py
+++ b/pyload/plugin/hoster/NovafileCom.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://novafile.com/vfun4z6o2cit
-# http://novafile.com/s6zrr5wemuz4
+# http://novafile.com/vfun4z6o2cit
+# http://novafile.com/s6zrr5wemuz4
from pyload.plugin.internal.XFSHoster import XFSHoster
diff --git a/pyload/plugin/hoster/OboomCom.py b/pyload/plugin/hoster/OboomCom.py
index 07c40a397..c37e89339 100644
--- a/pyload/plugin/hoster/OboomCom.py
+++ b/pyload/plugin/hoster/OboomCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# https://www.oboom.com/B7CYZIEB/10Mio.dat
+# https://www.oboom.com/B7CYZIEB/10Mio.dat
import re
diff --git a/pyload/plugin/hoster/RemixshareCom.py b/pyload/plugin/hoster/RemixshareCom.py
index 6e376fd6d..ba61887cd 100644
--- a/pyload/plugin/hoster/RemixshareCom.py
+++ b/pyload/plugin/hoster/RemixshareCom.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://remixshare.com/download/z8uli
+# http://remixshare.com/download/z8uli
#
# Note:
-# The remixshare.com website is very very slow, so
-# if your download not starts because of pycurl timeouts:
-# Adjust timeouts in /usr/share/pyload/pyload/network/HTTPRequest.py
+# The remixshare.com website is very very slow, so
+# if your download not starts because of pycurl timeouts:
+# Adjust timeouts in /usr/share/pyload/pyload/network/HTTPRequest.py
import re
diff --git a/pyload/plugin/hoster/SolidfilesCom.py b/pyload/plugin/hoster/SolidfilesCom.py
index 39e5dd010..9998f26ad 100644
--- a/pyload/plugin/hoster/SolidfilesCom.py
+++ b/pyload/plugin/hoster/SolidfilesCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://www.solidfiles.com/d/609cdb4b1b
+# http://www.solidfiles.com/d/609cdb4b1b
from pyload.plugin.internal.SimpleHoster import SimpleHoster
diff --git a/pyload/plugin/hoster/SpeedyshareCom.py b/pyload/plugin/hoster/SpeedyshareCom.py
index 99626c765..b6d0a5898 100644
--- a/pyload/plugin/hoster/SpeedyshareCom.py
+++ b/pyload/plugin/hoster/SpeedyshareCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://speedy.sh/ep2qY/Zapp-Brannigan.jpg
+# http://speedy.sh/ep2qY/Zapp-Brannigan.jpg
import re
diff --git a/pyload/plugin/hoster/UploadheroCom.py b/pyload/plugin/hoster/UploadheroCom.py
index 912f4c505..d1c9fd2c7 100644
--- a/pyload/plugin/hoster/UploadheroCom.py
+++ b/pyload/plugin/hoster/UploadheroCom.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# http://uploadhero.co/dl/wQBRAVSM
+# http://uploadhero.co/dl/wQBRAVSM
import re
diff --git a/pyload/plugin/hoster/VidPlayNet.py b/pyload/plugin/hoster/VidPlayNet.py
index ab571f9ea..5d98d2fb3 100644
--- a/pyload/plugin/hoster/VidPlayNet.py
+++ b/pyload/plugin/hoster/VidPlayNet.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Test links:
-# BigBuckBunny_320x180.mp4 - 61.7 Mb - http://vidplay.net/38lkev0h3jv0
+# http://vidplay.net/38lkev0h3jv0
from pyload.plugin.internal.XFSHoster import XFSHoster
diff --git a/pyload/webui/filters.py b/pyload/webui/filters.py
index ea4b159fa..e11944c94 100644
--- a/pyload/webui/filters.py
+++ b/pyload/webui/filters.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+
import os
from os.path import abspath, commonprefix, join