diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-18 17:59:50 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-18 17:59:50 +0200 |
| commit | 6130a2377ca6754fee88773097ce220abef1aa47 (patch) | |
| tree | 76bea0d76393100fcf393c164c96d34f286aba7a /module/common | |
| parent | Added DuckcryptInfo decrypter, smaller fixes (diff) | |
| parent | dropdowns in navbar (diff) | |
| download | pyload-6130a2377ca6754fee88773097ce220abef1aa47.tar.xz | |
merged stable into default
Diffstat (limited to 'module/common')
| -rw-r--r-- | module/common/APIExerciser.py | 8 | ||||
| -rw-r--r-- | module/common/packagetools.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/module/common/APIExerciser.py b/module/common/APIExerciser.py index 96f5ce9cf..ac6bc6c15 100644 --- a/module/common/APIExerciser.py +++ b/module/common/APIExerciser.py @@ -59,7 +59,7 @@ class APIExerciser(Thread): def run(self): - self.core.log.info("API Excerciser started %d" % self.id) + self.core.log.info("API Exerciser started %d" % self.id) out = open("error.log", "ab") #core errors are not logged of course @@ -70,7 +70,7 @@ class APIExerciser(Thread): try: self.testAPI() except Exception: - self.core.log.error("Excerciser %d throw an execption" % self.id) + self.core.log.error("Exerciser %d throw an exception" % self.id) print_exc() out.write(format_exc() + 2 * "\n") out.flush() @@ -114,7 +114,7 @@ class APIExerciser(Thread): name = "".join(sample(string.ascii_letters, 10)) urls = createURLs() - self.api.addPackage(name, urls, choice([Destination.Queue, Destination.Collector])) + self.api.addPackage(name, urls, choice([Destination.Queue, Destination.Collector]), "") def deleteFiles(self): @@ -154,4 +154,4 @@ class APIExerciser(Thread): self.api.getAccounts(False) def getCaptchaTask(self): - self.api.getCaptchaTask(False)
\ No newline at end of file + self.api.getCaptchaTask(False) diff --git a/module/common/packagetools.py b/module/common/packagetools.py index 5bfbcba95..791a46d51 100644 --- a/module/common/packagetools.py +++ b/module/common/packagetools.py @@ -21,7 +21,7 @@ def parseNames(files): """ Generates packages names from name, data lists :param files: list of (name, data) - :return: packagenames mapt to data lists (eg. urls) + :return: packagenames mapped to data lists (eg. urls) """ packs = {} @@ -64,7 +64,7 @@ def parseNames(files): if len(split) > 1: name = split.pop(1) - #check if a already existing package may be ok for this file + #check if an already existing package may be ok for this file # found = False # for pack in packs: # if pack in file: |