slightly more readable version

1 files changed, 11 insertions, 11 deletions

diff --git a/pbserver.py b/pbserver.py
index 4185aa0..d1fcc32 100755
--- a/pbserver.py
+++ b/pbserver.py
@@ -1,19 +1,19 @@
 #!/usr/bin/python2.7
 from bottle import route, run, post, request, static_file
 
-from pb.Gradient import Gradient
-from pb.Imgrid import Imgrid
-from pb.Breaker import Breaker
-from pb.Pattern import Pattern
-from pb.Generate import Generate
-from pb.Imlandscape import Imlandscape
+from Pb.Gradient import Gradient
+from Pb.Imgrid import Imgrid
+from Pb.Breaker import Breaker
+from Pb.Pattern import Pattern
+from Pb.Generate import Generate
+from Pb.Imlandscape import Imlandscape
 
-from pb.Config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME, BIN_IDENTIFY
-import pb.lib.Utils as utils
+from Config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME, BIN_IDENTIFY
+from Pb import Pb
+from Db import Db
 
 import os
 import sys
-from pb.lib.Db import Db
 
 import sha
 from subprocess import call, Popen, PIPE
@@ -61,13 +61,13 @@ def s3move(filename,objectname):
 def format_im_data(im, insert_url="NULL"):
     directory = hashdir(im.filename)
     dimensions = bin_identify(im.filepath)
-    size = utils.file_size(im.filepath)
+    size = Pb.file_size(im.filepath)
     objectname = "im/{}/{}".format(directory, im.filename)
     try:
         s3move(im.filepath, objectname)
         cleanup(im.filepath)
         db.insert_cmd(
-            date=im.now, 
+            date=im._now, 
             remote_addr=request.environ.get('REMOTE_ADDR', "NULL"),
             username=im.params.get('username', "NULL"),
             url=insert_url,