diff options
| -rw-r--r-- | locale/django.pot | 40 | ||||
| -rw-r--r-- | module/FileDatabase.py | 9 |
2 files changed, 6 insertions, 43 deletions
diff --git a/locale/django.pot b/locale/django.pot index 71a5229c4..6ec4ce820 100644 --- a/locale/django.pot +++ b/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 20:58+0200\n" +"POT-Creation-Date: 2010-08-31 21:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,44 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ServerThread.py:45 -msgid "Database for Webinterface does not exitst, it will not be available." -msgstr "" - -#: ServerThread.py:46 -msgid "Please run: python pyLoadCore.py -s" -msgstr "" - -#: ServerThread.py:47 -msgid "" -"Go through the setup and create a database and add an user to gain access." -msgstr "" - -#: ServerThread.py:88 -msgid "SSL certificates not found." -msgstr "" - -#: ServerThread.py:98 -#, python-format -msgid "" -"Can't use %(server)s, either python-flup or %(server)s is not installed!" -msgstr "" - -#: ServerThread.py:132 -#, python-format -msgid "Starting nginx Webserver: %(host)s:%(port)d" -msgstr "" - -#: ServerThread.py:169 -#, python-format -msgid "Starting lighttpd Webserver: %(host)s:%(port)d" -msgstr "" - -#: ServerThread.py:179 -#, python-format -msgid "Starting django builtin Webserver: %(host)s:%(port)d" -msgstr "" - #: ajax/views.py:116 #, python-format msgid "waiting %s" diff --git a/module/FileDatabase.py b/module/FileDatabase.py index 9e1e84e8c..d4f28d887 100644 --- a/module/FileDatabase.py +++ b/module/FileDatabase.py @@ -261,7 +261,9 @@ class FileHandler: data = self.db.getPackageData(id) tmplist = [] - for x in self.cache.itervalues(): + + cache = self.cache.values() + for x in cache: if int(x.toDbDict()[x.id]["package"]) == int(id): tmplist.append((str(x.id), x.toDbDict()[x.id])) data.update(tmplist) @@ -801,8 +803,7 @@ class FileDatabaseBackend(Thread): """return pyfile instance, which is suitable for download and dont use a occupied plugin""" cmd = "(" - i = 0 - for item in occ: + for i, item in enumerate(occ): if i != 0: cmd += ", " cmd += "'%s'" % item @@ -922,7 +923,7 @@ class PyFile(): if self.plugin and self.plugin.req: self.plugin.req.abort = True sleep(0.1) - abort = False + self.abort = False if self.plugin and self.plugin.req: self.plugin.req.abort = False def finishIfDone(self): |