diff options
| -rw-r--r-- | pyload/database/Backend.py (renamed from pyload/database/DatabaseBackend.py) | 0 | ||||
| -rw-r--r-- | pyload/database/File.py | 2 | ||||
| -rw-r--r-- | pyload/database/User.py | 3 | ||||
| -rw-r--r-- | pyload/database/__init__.py | 5 | ||||
| -rw-r--r-- | pyload/network/HTTPDownload.py | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/pyload/database/DatabaseBackend.py b/pyload/database/Backend.py index 4b63dd284..4b63dd284 100644 --- a/pyload/database/DatabaseBackend.py +++ b/pyload/database/Backend.py diff --git a/pyload/database/File.py b/pyload/database/File.py index 0b22805a7..cd1b0d044 100644 --- a/pyload/database/File.py +++ b/pyload/database/File.py @@ -8,7 +8,7 @@ from pyload.utils import formatSize, lock from pyload.manager.Event import InsertEvent, ReloadAllEvent, RemoveEvent, UpdateEvent from pyload.datatype.Package import PyPackage from pyload.datatype.File import PyFile -from pyload.database import style, DatabaseBackend +from pyload.database import DatabaseBackend, style try: from pysqlite2 import dbapi2 as sqlite3 diff --git a/pyload/database/User.py b/pyload/database/User.py index 67cb62ab9..54545e588 100644 --- a/pyload/database/User.py +++ b/pyload/database/User.py @@ -4,8 +4,7 @@ from hashlib import sha1 import random -from pyload.database.DatabaseBackend import DatabaseBackend -from pyload.database.DatabaseBackend import style +from pyload.database import DatabaseBackend, style class UserMethods(object): @style.queue diff --git a/pyload/database/__init__.py b/pyload/database/__init__.py index 64f049be1..4e0edc5d1 100644 --- a/pyload/database/__init__.py +++ b/pyload/database/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -from pyload.database.DatabaseBackend import DatabaseBackend, style - +from pyload.database.Backend import DatabaseBackend, style from pyload.database.File import FileHandler -from pyload.database.User import UserMethods from pyload.database.Storage import StorageMethods +from pyload.database.User import UserMethods diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py index 3b2bf26ca..acefbe62e 100644 --- a/pyload/network/HTTPDownload.py +++ b/pyload/network/HTTPDownload.py @@ -272,7 +272,7 @@ class HTTPDownload(object): if self.abort: raise Abort - #sleep(0.003) #supress busy waiting - limits dl speed to (1 / x) * buffersize + # sleep(0.003) #supress busy waiting - limits dl speed to (1 / x) * buffersize self.m.select(1) for chunk in self.chunks: |