Use 'import' instead 'from' (2)

2 files changed, 16 insertions, 15 deletions

diff --git a/pyload/webui/app/api.py b/pyload/webui/app/api.py
index 70d86c112..7f1b230da 100644
--- a/pyload/webui/app/api.py
+++ b/pyload/webui/app/api.py
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from urllib import unquote
+import traceback
+
 from itertools import chain
-from traceback import format_exc, print_exc
+from urllib import unquote
 
+from SafeEval import const_eval as literal_eval
 from bottle import route, request, response, HTTPError
 
-from pyload.webui.app.utils import toDict, set_session
-from pyload.webui import PYLOAD
-from pyload.utils import json
-from SafeEval import const_eval as literal_eval
 from pyload.api import BaseObject
-
+from pyload.utils import json
+from pyload.webui import PYLOAD
+from pyload.webui.app.utils import toDict, set_session
 
 
 # json encoder that accepts TBase objects
@@ -51,8 +51,8 @@ def call_api(func, args=""):
     try:
         return callApi(func, *args, **kwargs)
     except Exception, e:
-        print_exc()
-        return HTTPError(500, json.dumps({"error": e.message, "traceback": format_exc()}))
+        traceback.print_exc()
+        return HTTPError(500, json.dumps({"error": e.message, "traceback": traceback.format_exc()}))
 
 
 def callApi(func, *args, **kwargs):
diff --git a/pyload/webui/app/json.py b/pyload/webui/app/json.py
index 3b72cb7ce..400eba624 100644
--- a/pyload/webui/app/json.py
+++ b/pyload/webui/app/json.py
@@ -2,15 +2,16 @@
 
 from __future__ import with_statement
 
+import shutil
+import traceback
+
 from os.path import join
-from traceback import print_exc
-from shutil import copyfileobj
 
 from bottle import route, request, HTTPError
 
+from pyload.utils import decode, formatSize
 from pyload.webui import PYLOAD
 from pyload.webui.app.utils import login_required, render_to_response, toDict
-from pyload.utils import decode, formatSize
 
 
 def format_time(seconds):
@@ -60,7 +61,7 @@ def links():
         data = {'links': links, 'ids': ids}
         return data
     except Exception, e:
-        print_exc()
+        traceback.print_exc()
         return HTTPError()
 
 
@@ -113,7 +114,7 @@ def package(id):
         return data
 
     except Exception:
-        print_exc()
+        traceback.print_exc()
         return HTTPError()
 
 
@@ -167,7 +168,7 @@ def add_package():
 
         fpath = join(PYLOAD.getConfigValue("general", "download_folder"), "tmp_" + f.filename)
         with open(fpath, 'wb') as destination:
-            copyfileobj(f.file, destination)
+            shutil.copyfileobj(f.file, destination)
         links.insert(0, fpath)
     except Exception:
         pass