good

1 files changed, 9 insertions, 10 deletions

diff --git a/pbserver.py b/pbserver.py
index e7f190a..02a17ed 100755
--- a/pbserver.py
+++ b/pbserver.py
@@ -6,12 +6,11 @@ from imgrid import Imgrid
 from breaker import Breaker
 from pattern import Pattern
 
-from s3config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME
+from config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME
 
 import os
 import sys
-import db
-import s3
+import lib.db as db
 import mimetypes
 import sha
 from subprocess import call, Popen, PIPE
@@ -20,12 +19,12 @@ BIN_IDENTIFY = "/usr/bin/identify"
 
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
-
-try:
-    DB = db.db ()
-except Exception as e:
-    sys.stderr.write("Could not connect to db:\n{}".format(e))
-    sys.exit(1);
+#
+#try:
+#    DB = db.db ()
+#except Exception as e:
+#    sys.stderr.write("Could not connect to db:\n{}".format(e))
+#    sys.exit(1);
 BASE_URL = "http://i.asdf.us"
 
 def hashdir(filename):
@@ -113,7 +112,7 @@ def return_image(im, insert_url="NULL"):
 @post('/im/api/imgradient')
 def gradient():
     try:
-        im = Gradient(request.forms)
+        im = Gradient(**(dict(request.forms)))
         im.create();
         return return_image(im)
     except Exception as e: