renamed modules

24 files changed, 41 insertions, 42 deletions

diff --git a/lib/Db.py b/lib/db.py
index c6286ad..c6286ad 100644
--- a/lib/Db.py
+++ b/lib/db.py
diff --git a/lib/Param/__init__.py b/lib/param/__init__.py
index c658c61..bdf5885 100644
--- a/lib/Param/__init__.py
+++ b/lib/param/__init__.py
@@ -54,12 +54,12 @@ class Param(object):
       if error:
         sys.stderr.write("PARAM ERROR: {}\n".format(str(error)))
 
-from Param.Int import ParamInt
-from Param.Raw import ParamRaw
-from Param.Bool import ParamBool
-from Param.Enum import ParamEnum
-from Param.Json import ParamJson
-from Param.Color import ParamColor
-from Param.Float import ParamFloat
-from Param.Img_url import ParamImg_url
-from Param.String import ParamString
+from param.int_ import ParamInt
+from param.raw import ParamRaw
+from param.bool_ import ParamBool
+from param.enum import ParamEnum
+from param.json import ParamJson
+from param.color import ParamColor
+from param.float_ import ParamFloat
+from param.img_url import ParamImg_url
+from param.string import ParamString
diff --git a/lib/Param/Bool.py b/lib/param/bool_.py
index 7b779cb..e275115 100644
--- a/lib/Param/Bool.py
+++ b/lib/param/bool_.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 import re
 import sys
 class ParamBool(Param):
diff --git a/lib/Param/Color.py b/lib/param/color.py
index 9163338..5293642 100644
--- a/lib/Param/Color.py
+++ b/lib/param/color.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 import re
 class ParamColor(Param):
   def __init__(self, value, classname=""):
diff --git a/lib/Param/Enum.py b/lib/param/enum.py
index 3923a64..1dd510a 100644
--- a/lib/Param/Enum.py
+++ b/lib/param/enum.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 import sys
 class ParamEnum(Param):
   def __init__(self, value, enum_values=[], classname=""):
diff --git a/lib/Param/Float.py b/lib/param/float_.py
index 0581815..a67bd44 100644
--- a/lib/Param/Float.py
+++ b/lib/param/float_.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 
 class ParamFloat(Param):
   def __init__(self, value, classname=""):
diff --git a/lib/Param/Img_url.py b/lib/param/img_url.py
index 55bf353..a73fdd0 100644
--- a/lib/Param/Img_url.py
+++ b/lib/param/img_url.py
@@ -1,5 +1,5 @@
 import os
-from Param import Param
+from param import Param
 from config import *
 import urllib, urllib2
 from subprocess import Popen, PIPE
diff --git a/lib/Param/Int.py b/lib/param/int_.py
index 0a73cc1..fd9730d 100644
--- a/lib/Param/Int.py
+++ b/lib/param/int_.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 
 class ParamInt(Param):
   def __init__(self, value, classname=""):
diff --git a/lib/Param/Json.py b/lib/param/json.py
index 28a7126..8897710 100644
--- a/lib/Param/Json.py
+++ b/lib/param/json.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 import simplejson as json
 
 class ParamJson(Param):
diff --git a/lib/Param/Raw.py b/lib/param/raw.py
index f8adaab..f9cdea9 100644
--- a/lib/Param/Raw.py
+++ b/lib/param/raw.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 
 class ParamRaw(Param):
   def __init__(self, value, classname=""):
diff --git a/lib/Param/String.py b/lib/param/string.py
index 8f08e49..91a2d34 100644
--- a/lib/Param/String.py
+++ b/lib/param/string.py
@@ -1,4 +1,4 @@
-from Param import Param
+from param import Param
 import re
 import sys
 class ParamString(Param):
diff --git a/lib/Params.py b/lib/params.py
index e3ba10b..409dee8 100644
--- a/lib/Params.py
+++ b/lib/params.py
@@ -1,7 +1,7 @@
 import re
 import os
 import sys
-from Param import *
+from param import *
 
 class BadParamError(Exception):
   pass
diff --git a/lib/Pb/__init__.py b/lib/pb/__init__.py
index c717cc4..29569c6 100644
--- a/lib/Pb/__init__.py
+++ b/lib/pb/__init__.py
@@ -5,11 +5,11 @@ import urllib, urllib2
 import sys, os
 import random
 from subprocess import Popen,PIPE,call
-from Params import Params
+from params import Params
 import sha
 import simplejson as json
-from S3Cli import S3Cli
-from Db import Db
+from s3cli import S3Cli
+from db import Db
 BASE_URL = "http://i.asdf.us"
 
 Request = urllib2.Request
@@ -193,9 +193,9 @@ class Pb(object):
     self._file_size_get()
     self._cleanup();  
 
-from Pb.Grid import PbGrid
-from Pb.Break import PbBreak
-from Pb.Pattern import PbPattern
-from Pb.Generate import PbGenerate
-from Pb.Landscape import PbLandscape
-from Pb.Gradient import PbGradient
+from pb.grid import PbGrid
+from pb.breaker import PbBreaker
+from pb.pattern import PbPattern
+from pb.generate import PbGenerate
+from pb.landscape import PbLandscape
+from pb.gradient import PbGradient
diff --git a/lib/Pb/Break.py b/lib/pb/breaker.py
index b7edfb1..a38030a 100755
--- a/lib/Pb/Break.py
+++ b/lib/pb/breaker.py
@@ -6,8 +6,8 @@ import re
 import urllib
 import inspect
 from config import *
-from Pb import Pb
-from Params import Params
+from pb import Pb
+from params import Params
 
 DEFAULT_FINALFORMAT = "png";
 
@@ -17,7 +17,7 @@ _extreme_break_mark = 'sugar'
 _header_offset = 2000
 _default_breakmode = "subtle"
 
-class PbBreak(Pb): #FIXME in db gallery
+class PbBreaker(Pb): #FIXME in db gallery
     example_params = {
         "url" : "http://i.asdf.us/im/de/HolyMountain2_1322275112_seamonkey.gif",
         "breaktype" : "RGB_WASH",
@@ -28,7 +28,7 @@ class PbBreak(Pb): #FIXME in db gallery
         "expanded" : "false"
     }
     def __init__(self, **kwargs):
-        super(PbBreak,self).__init__(**kwargs);
+        super(PbBreaker,self).__init__(**kwargs);
         _definitions = {
           'username': { 'type': 'string' },
           'breaktype': { 'type': 'string' },
@@ -167,5 +167,5 @@ class PbBreak(Pb): #FIXME in db gallery
         self._prepare_filedata();
         self._add_false_data();
         self._final_conversion() 
-        super(PbBreak, self).create()
+        super(PbBreaker, self).create()
 
diff --git a/lib/Pb/Generate.py b/lib/pb/generate.py
index e631002..088ca3c 100755
--- a/lib/Pb/Generate.py
+++ b/lib/pb/generate.py
@@ -2,7 +2,7 @@
 import sys
 import os
 from config import *
-from Pb import Pb
+from pb import Pb
 _default_tag = "im"
 
 _gravity_params = ["NorthWest","North","NorthEast","West","Center","East","SouthWest","South","SouthEast"]
diff --git a/lib/Pb/Gradient.py b/lib/pb/gradient.py
index 340ce62..22fe561 100755
--- a/lib/Pb/Gradient.py
+++ b/lib/pb/gradient.py
@@ -7,7 +7,7 @@ import sys
 import os

 import sha

 from config import *

-from Pb import Pb

+from pb import Pb

 

 _default_color_1 = "white"

 _default_color_2 = "black"

diff --git a/lib/Pb/Grid.py b/lib/pb/grid.py
index b0d731f..53d31df 100755
--- a/lib/Pb/Grid.py
+++ b/lib/pb/grid.py
@@ -6,7 +6,7 @@ import random
 from config import DEFAULT_FINALFORMAT, DEFAULT_HEIGHT, DEFAULT_WIDTH, WORKING_DIR, OUTPUT_IMAGE_TYPES
 from config import THREEDROTATE, GRID, BIN_CONVERT, BIN_COMPOSITE
 import tempfile
-from Pb import Pb
+from pb import Pb
 
 _default_line_color = "silver"
 
diff --git a/lib/Pb/Landscape/__init__.py b/lib/pb/landscape/__init__.py
index 5dd8329..54f9806 100755
--- a/lib/Pb/Landscape/__init__.py
+++ b/lib/pb/landscape/__init__.py
@@ -1,12 +1,11 @@
 from config import *
-import Pb
 import base64
-from Pb import Pb
+from pb import Pb
 import urlparse, re
 
 class PbLandscape(Pb):
     example_params = {
-      'imgdata' : open('lib/Pb/Landscape/_base64img', 'rb').read(),
+      'imgdata' : open('lib/pb/landscape/_base64img', 'rb').read(),
       'texture' : 'http://someurl.biz/someimg.jpg',
       'heightmap' : 'http://someurl.biz/someimg.jpg',
       'name' : 'donkey'
diff --git a/lib/Pb/Landscape/_base64img b/lib/pb/landscape/_base64img
index bb7e093..bb7e093 100644
--- a/lib/Pb/Landscape/_base64img
+++ b/lib/pb/landscape/_base64img
diff --git a/lib/Pb/Pattern.py b/lib/pb/pattern.py
index 6ae6eb7..040eb18 100755
--- a/lib/Pb/Pattern.py
+++ b/lib/pb/pattern.py
@@ -4,7 +4,7 @@ import random
 import re
 import urllib
 from config import *
-from Pb import Pb
+from pb import Pb
 
 import simplejson as json
 from PIL import Image
diff --git a/lib/S3Cli.py b/lib/s3cli.py
index 70ba24c..70ba24c 100644
--- a/lib/S3Cli.py
+++ b/lib/s3cli.py
diff --git a/lib/Server.py b/lib/server.py
index 00bae9f..00bae9f 100644
--- a/lib/Server.py
+++ b/lib/server.py
diff --git a/run_module_examples.py b/run_module_examples.py
index 1c385b2..9a6ab10 100644
--- a/run_module_examples.py
+++ b/run_module_examples.py
@@ -1,6 +1,6 @@
 import sys
 sys.path.append('./lib')
-from Pb import *
+from pb import *
 for cls in Pb.__subclasses__():
   print cls.__name__
   instance = cls.example_run()
diff --git a/run_server.py b/run_server.py
index 2596024..3d759ed 100644
--- a/run_server.py
+++ b/run_server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python2
 import sys
 sys.path.append("./lib")
-from Server import Server
+from server import Server
 server = Server()
 server.run()