summaryrefslogtreecommitdiffstats
path: root/pyload
diff options
context:
space:
mode:
Diffstat (limited to 'pyload')
-rw-r--r--pyload/api/__init__.py2
-rw-r--r--pyload/database/FileDatabase.py4
-rw-r--r--pyload/datatype/PyFile.py (renamed from pyload/datatypes/PyFile.py)0
-rw-r--r--pyload/datatype/PyPackage.py (renamed from pyload/datatypes/PyPackage.py)0
-rw-r--r--pyload/datatype/__init__.py (renamed from pyload/datatypes/__init__.py)0
-rw-r--r--pyload/manager/ThreadManager.py2
-rw-r--r--pyload/plugins/addon/UnSkipOnFail.py2
-rw-r--r--pyload/plugins/hoster/DailymotionCom.py2
8 files changed, 6 insertions, 6 deletions
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index eb764a4f9..570dc5eac 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -23,7 +23,7 @@ import re
from urlparse import urlparse
-from pyload.datatypes.PyFile import PyFile
+from pyload.datatype.PyFile import PyFile
from pyload.utils.packagetools import parseNames
from network.RequestFactory import getURL
from remote import activated
diff --git a/pyload/database/FileDatabase.py b/pyload/database/FileDatabase.py
index bdc0f5994..fdffe3fe7 100644
--- a/pyload/database/FileDatabase.py
+++ b/pyload/database/FileDatabase.py
@@ -22,8 +22,8 @@ from time import time
from pyload.utils import formatSize, lock
from pyload.manager.event.PullEvents import InsertEvent, ReloadAllEvent, RemoveEvent, UpdateEvent
-from pyload.datatypes.PyPackage import PyPackage
-from pyload.datatypes.PyFile import PyFile
+from pyload.datatype.PyPackage import PyPackage
+from pyload.datatype.PyFile import PyFile
from pyload.database import style, DatabaseBackend
try:
diff --git a/pyload/datatypes/PyFile.py b/pyload/datatype/PyFile.py
index be3129681..be3129681 100644
--- a/pyload/datatypes/PyFile.py
+++ b/pyload/datatype/PyFile.py
diff --git a/pyload/datatypes/PyPackage.py b/pyload/datatype/PyPackage.py
index c8d3e6096..c8d3e6096 100644
--- a/pyload/datatypes/PyPackage.py
+++ b/pyload/datatype/PyPackage.py
diff --git a/pyload/datatypes/__init__.py b/pyload/datatype/__init__.py
index e69de29bb..e69de29bb 100644
--- a/pyload/datatypes/__init__.py
+++ b/pyload/datatype/__init__.py
diff --git a/pyload/manager/ThreadManager.py b/pyload/manager/ThreadManager.py
index 50af4a93a..7e7958f8c 100644
--- a/pyload/manager/ThreadManager.py
+++ b/pyload/manager/ThreadManager.py
@@ -28,7 +28,7 @@ from random import choice
import pycurl
from pyload.manager.thread import PluginThread
-from pyload.datatypes.PyFile import PyFile
+from pyload.datatype.PyFile import PyFile
from pyload.network.RequestFactory import getURL
from pyload.utils import freeSpace, lock
diff --git a/pyload/plugins/addon/UnSkipOnFail.py b/pyload/plugins/addon/UnSkipOnFail.py
index 1a064562f..0bccca75f 100644
--- a/pyload/plugins/addon/UnSkipOnFail.py
+++ b/pyload/plugins/addon/UnSkipOnFail.py
@@ -2,7 +2,7 @@
from os.path import basename
-from pyload.datatypes.PyFile import PyFile
+from pyload.datatype.PyFile import PyFile
from pyload.plugins.internal.Addon import Addon
from pyload.utils import fs_encode
diff --git a/pyload/plugins/hoster/DailymotionCom.py b/pyload/plugins/hoster/DailymotionCom.py
index 4b3af6e8f..cd66e6e21 100644
--- a/pyload/plugins/hoster/DailymotionCom.py
+++ b/pyload/plugins/hoster/DailymotionCom.py
@@ -2,7 +2,7 @@
import re
-from pyload.datatypes.PyFile import statusMap
+from pyload.datatype.PyFile import statusMap
from pyload.utils import json_loads
from pyload.network.RequestFactory import getURL
from pyload.plugins.internal.Hoster import Hoster