General fixup (1)

2 files changed, 7 insertions, 4 deletions

diff --git a/pyload/Database/Backend.py b/pyload/Database/Backend.py
index 622880e65..846586417 100644
--- a/pyload/Database/Backend.py
+++ b/pyload/Database/Backend.py
@@ -9,12 +9,11 @@ except Exception:
     import sqlite3
 
 import Queue
+import os
 import shutil
 import threading
 import traceback
 
-from pyload.utils import chmod
-
 
 DB_VERSION = 4
 
@@ -138,7 +137,11 @@ class DatabaseBackend(threading.Thread):
         convert = self._checkVersion()  #: returns None or current version
 
         self.conn = sqlite3.connect("files.db")
-        os.chmod("files.db", 0600)
+
+        try:
+            os.chmod("files.db", 0600)
+        except Exception:
+            pass
 
         self.c = self.conn.cursor()  #: compatibility
 
diff --git a/pyload/Database/User.py b/pyload/Database/User.py
index b895a4e12..83ee66b93 100644
--- a/pyload/Database/User.py
+++ b/pyload/Database/User.py
@@ -82,7 +82,7 @@ class UserMethods(object):
     @style.queue
     def getAllUserData(db):
         db.c.execute("SELECT name, permission, role, template, email FROM users")
-        return dict(r[0], {"permission": r[1], "role": r[2], "template": r[3], "email": r[4]}) for r in db.c)
+        return dict((r[0], {"permission": r[1], "role": r[2], "template": r[3], "email": r[4]}) for r in db.c)
 
 
     @style.queue