25 files changed, 18 insertions, 21 deletions

diff --git a/icons/abort.png b/icons/abort.png
deleted file mode 100644
index 66170aae7..000000000
--- a/icons/abort.png
+++ /dev/null
diff --git a/icons/add_small.png b/icons/add_small.png
deleted file mode 100644
index 4dc88b09b..000000000
--- a/icons/add_small.png
+++ /dev/null
diff --git a/icons/clipboard.png b/icons/clipboard.png
deleted file mode 100644
index 9ba608eba..000000000
--- a/icons/clipboard.png
+++ /dev/null
diff --git a/icons/close.png b/icons/close.png
deleted file mode 100644
index 66170aae7..000000000
--- a/icons/close.png
+++ /dev/null
diff --git a/icons/edit_small.png b/icons/edit_small.png
deleted file mode 100644
index eb76e21b4..000000000
--- a/icons/edit_small.png
+++ /dev/null
diff --git a/icons/logo-gui.png b/icons/logo-gui.png
deleted file mode 100644
index 5994b274d..000000000
--- a/icons/logo-gui.png
+++ /dev/null
diff --git a/icons/logo.png b/icons/logo.png
deleted file mode 100644
index 72a95b740..000000000
--- a/icons/logo.png
+++ /dev/null
diff --git a/icons/pull_small.png b/icons/pull_small.png
deleted file mode 100644
index 432ad321f..000000000
--- a/icons/pull_small.png
+++ /dev/null
diff --git a/icons/push_small.png b/icons/push_small.png
deleted file mode 100644
index 701fc69e3..000000000
--- a/icons/push_small.png
+++ /dev/null
diff --git a/icons/pyload-gui.ico b/icons/pyload-gui.ico
deleted file mode 100644
index 00a1a53ff..000000000
--- a/icons/pyload-gui.ico
+++ /dev/null
diff --git a/icons/pyload.ico b/icons/pyload.ico
deleted file mode 100644
index 58b1f4b89..000000000
--- a/icons/pyload.ico
+++ /dev/null
diff --git a/icons/pyload2.ico b/icons/pyload2.ico
deleted file mode 100644
index c2b497986..000000000
--- a/icons/pyload2.ico
+++ /dev/null
diff --git a/icons/refresh1_small.png b/icons/refresh1_small.png
deleted file mode 100644
index ce4f24efc..000000000
--- a/icons/refresh1_small.png
+++ /dev/null
diff --git a/icons/refresh_small.png b/icons/refresh_small.png
deleted file mode 100644
index 1ffd18d97..000000000
--- a/icons/refresh_small.png
+++ /dev/null
diff --git a/icons/remove_small.png b/icons/remove_small.png
deleted file mode 100644
index bf99763e8..000000000
--- a/icons/remove_small.png
+++ /dev/null
diff --git a/icons/toolbar_add.png b/icons/toolbar_add.png
deleted file mode 100644
index 17003e9f0..000000000
--- a/icons/toolbar_add.png
+++ /dev/null
diff --git a/icons/toolbar_pause.png b/icons/toolbar_pause.png
deleted file mode 100644
index b7a727b71..000000000
--- a/icons/toolbar_pause.png
+++ /dev/null
diff --git a/icons/toolbar_remove.png b/icons/toolbar_remove.png
deleted file mode 100644
index 1e9c00e16..000000000
--- a/icons/toolbar_remove.png
+++ /dev/null
diff --git a/icons/toolbar_start.png b/icons/toolbar_start.png
deleted file mode 100644
index 1123266e6..000000000
--- a/icons/toolbar_start.png
+++ /dev/null
diff --git a/icons/toolbar_stop.png b/icons/toolbar_stop.png
deleted file mode 100644
index b388e3d72..000000000
--- a/icons/toolbar_stop.png
+++ /dev/null
diff --git a/module/Api.py b/module/Api.py
index fba02d574..ac9ea7f79 100644
--- a/module/Api.py
+++ b/module/Api.py
@@ -25,7 +25,8 @@ from itertools import chain
 
 
 from PyFile import PyFile
-from utils import freeSpace, compare_time, to_string
+from utils import compare_time, to_string
+from utils.fs import free_space
 from common.packagetools import parseNames
 from network.RequestFactory import getURL
 from remote import activated
@@ -213,7 +214,7 @@ class Api(Iface):
     @permission(PERMS.STATUS)
     def freeSpace(self):
         """Available free space at download directory in bytes"""
-        return freeSpace(self.core.config["general"]["download_folder"])
+        return free_space(self.core.config["general"]["download_folder"])
 
     @permission(PERMS.ALL)
     def getServerVersion(self):
diff --git a/module/utils/__init__.py b/module/utils/__init__.py
index 3b0fb673a..b68928f04 100644
--- a/module/utils/__init__.py
+++ b/module/utils/__init__.py
@@ -66,12 +66,6 @@ def formatSize(size):
 def formatSpeed(speed):
     return formatSize(speed) + "/s"
 
-
-def freeSpace(folder):
-    print "Deprecated freeSpace"
-    return free_space(folder)
-
-
 def uniqify(seq): #by Dave Kirby
     """ removes duplicates from list, preserve order """
     seen = set()
@@ -192,6 +186,4 @@ def html_unescape(text):
     return re.sub("&#?\w+;", fixup, text)
 
 if __name__ == "__main__":
-    print freeSpace(".")
-
-    print remove_chars("ab'cdgdsf''ds'", "'ghd")
\ No newline at end of file
+    print remove_chars("ab'cdgdsf''ds'", "'ghd")
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index a19dce24c..dcfc3266e 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -36,7 +36,7 @@ from utils import render_to_response, parse_permissions, parse_userdata, \
 from filters import relpath, unquotepath
 
 from module.utils import formatSize
-from module.utils.fs import save_join, fs_encode, fs_decode, listdir
+from module.utils.fs import save_join, fs_encode, fs_decode, listdir, free_space
 
 # Helper
 
@@ -509,7 +509,7 @@ def setup():
 @login_required("STATUS")
 @route("/info")
 def info():
-    conf = PYLOAD.getConfigDict()
+    conf = PYLOAD.getConfigPointer()
 
     if hasattr(os, "uname"):
         extra = os.uname()
@@ -520,10 +520,10 @@ def info():
             "os": " ".join((os.name, sys.platform) + extra),
             "version": PYLOAD.getServerVersion(),
             "folder": abspath(PYLOAD_DIR), "config": abspath(""),
-            "download": abspath(conf["general"]["download_folder"]["value"]),
+            "download": abspath(conf["general"]["download_folder"]),
             "freespace": formatSize(PYLOAD.freeSpace()),
-            "remote": conf["remote"]["port"]["value"],
-            "webif": conf["webinterface"]["port"]["value"],
-            "language": conf["general"]["language"]["value"]}
+            "remote": conf["remote"]["port"],
+            "webif": conf["webinterface"]["port"],
+            "language": conf["general"]["language"]}
 
     return render_to_response("info.html", data, [pre_processor])
diff --git a/pavement.py b/pavement.py
index f3e8651c5..4b5ccb883 100644
--- a/pavement.py
+++ b/pavement.py
@@ -3,7 +3,10 @@
 
 from paver.easy import *
 from paver.setuputils import setup
-from paver.doctools import cog
+try:
+    from paver.doctools import cog
+except:
+    cog = None
 
 import fnmatch
 
@@ -162,7 +165,7 @@ def get_source(options):
 
 
 @task
-@needs('clean', 'generate_setup', 'minilib', 'get_source', 'setuptools.command.sdist')
+@needs('clean', 'generate_setup', 'get_source', 'setuptools.command.sdist')
 def sdist():
     """ Build source code package with distutils """
 
@@ -257,7 +260,8 @@ def generate_locale():
 
 @task
 def tests():
-    call(["nosetests2"])
+    """ Run nosetests """
+    call(["tests/nosetests.sh"])
 
 @task
 def virtualenv(options):
@@ -278,7 +282,7 @@ def clean_env():
 
 
 @task
-@needs('generate_setup', 'minilib', 'get_source', 'virtualenv')
+@needs('generate_setup', 'get_source', 'virtualenv')
 def env_install():
     """Install pyLoad into the virtualenv"""
     venv = options.virtualenv
diff --git a/paver-minilib.zip b/paver-minilib.zip
index 85c0c671e..15cb0ecb3 100644
--- a/paver-minilib.zip
+++ b/paver-minilib.zip