diff options
| -rw-r--r-- | module/download_thread.py | 3 | ||||
| -rw-r--r-- | module/file_list.py | 8 | ||||
| -rwxr-xr-x | pyLoadCli.py | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/module/download_thread.py b/module/download_thread.py index 78111b8d2..98e4915c5 100644 --- a/module/download_thread.py +++ b/module/download_thread.py @@ -19,8 +19,7 @@ ### import threading import traceback -from time import sleep -from time import time +from time import sleep, time from module.network.Request import AbortDownload diff --git a/module/file_list.py b/module/file_list.py index b7455410c..fadab0425 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -21,8 +21,9 @@ LIST_VERSION = 2 from threading import RLock - +from download_thread import Status import cPickle +import re from module.remote.RequestObject import RequestObject class File_List(object): @@ -45,6 +46,7 @@ class File_List(object): if not url: return False #@TODO: filter non existence and invalid links + #re.compile("https?://[-a-z0-9\.]{4,}(?::\d+)?/[^#?]+(?:#\S+)?",re.IGNORECASE) new_file = self.new_pyfile(url) self.files.append(new_file) self.data[new_file.id] = Data(url) @@ -138,10 +140,6 @@ class File_List(object): class Data(): def __init__(self, url): self.url = url - -import re - -from download_thread import Status class PyLoadFile: """ represents the url or file diff --git a/pyLoadCli.py b/pyLoadCli.py index 2f94fb2ce..11158cb7b 100755 --- a/pyLoadCli.py +++ b/pyLoadCli.py @@ -338,10 +338,5 @@ if __name__ == "__main__": port = raw_input("Port:") password = raw_input("Password:") - print address - print port - print password - - cli = pyLoadCli(address, port, password) |