summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/plugins/captcha/captcha.py2
-rw-r--r--module/setup.py2
-rwxr-xr-xpyLoadCore.py7
3 files changed, 8 insertions, 3 deletions
diff --git a/module/plugins/captcha/captcha.py b/module/plugins/captcha/captcha.py
index ed235246a..51021e8a5 100644
--- a/module/plugins/captcha/captcha.py
+++ b/module/plugins/captcha/captcha.py
@@ -18,7 +18,7 @@
#
###
from __future__ import with_statement
-import os.name
+import os
from os.path import join
import logging
import subprocess
diff --git a/module/setup.py b/module/setup.py
index 96c56edda..63da0e83e 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -20,7 +20,7 @@ from getpass import getpass
import gettext
from hashlib import sha1
from os import remove
-import os.name
+import os
from os.path import abspath
from os.path import dirname
from os.path import isfile
diff --git a/pyLoadCore.py b/pyLoadCore.py
index e102d2a3e..6183e5636 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -152,7 +152,12 @@ class Core(object):
print "This is your first start, running configuration assistent now."
self.config = ConfigParser()
s = Setup(pypath, self.config)
- res = s.start()
+ try:
+ res = s.start()
+ except:
+ res = False
+ print_exc()
+ print "Setup failed"
if not res:
remove("pyload.conf")
exit()