trying to get username in

3 files changed, 5 insertions, 14 deletions

diff --git a/photoblaster/modules/pbgenerate/__init__.py b/photoblaster/modules/pbgenerate/__init__.py
index c38e011..f5cfbc0 100755
--- a/photoblaster/modules/pbgenerate/__init__.py
+++ b/photoblaster/modules/pbgenerate/__init__.py
@@ -128,15 +128,6 @@ class PbGenerate(ModuleBase):
         elif self.params.transparent:
             self.tag = "%s:%s" % (self.tag, "transparent")
 
-        print('HERE WE ARE')
-        print("username: {}".format(str(self.params.username)))
-        if str(self.params.username):
-            print("username: {}".format(str(self.params.username)))
-            if self.params.background:
-                self.params.background.set_username(str(self.params.username))
-            if self.params.url:
-                self.params.url.set_username(str(self.params.username))
-
         self.set_output_file(
             File.from_url(
                 self.params.url['url'],
diff --git a/photoblaster/param/img_url.py b/photoblaster/param/img_url.py
index e8b6a45..da3c62b 100644
--- a/photoblaster/param/img_url.py
+++ b/photoblaster/param/img_url.py
@@ -9,7 +9,7 @@ from subprocess import Popen, PIPE
 
 
 class Img_url(Param):
-    def __init__(self, value, key="", classname="", module=None):
+    def __init__(self, value, key="", classname="", module=None, username=""):
         """Defines the float param type.
            Takes in a url, sends a get request to the url, writes the response
            to a temporary filename, and checks the mimetype with imagemagick.
diff --git a/photoblaster/params.py b/photoblaster/params.py
index 05349b8..184015f 100644
--- a/photoblaster/params.py
+++ b/photoblaster/params.py
@@ -51,8 +51,10 @@ class Params(object):
         along with the keyword arguments of the module and maps them
         to attribute values of the params class"""
         value = None
+        username = ""
+        if 'username' in classkwargs:
+            username = classkwargs.get('username', None)
         for key in def_dict.keys():
-            print(key)
             value = None
             if key in classkwargs:
                 value = classkwargs.get(key, None) or \
@@ -72,7 +74,7 @@ class Params(object):
                 instance = Float(value, classname=classname)
             elif def_dict[key]['type'] == "img_url":
                 instance = Img_url(
-                    value, key=key, classname=classname, module=module)
+                    value, key=key, classname=classname, module=module, username=username)
             elif def_dict[key]['type'] == "int":
                 instance = Int(value, classname=classname)
             elif def_dict[key]['type'] == "json":
@@ -82,5 +84,3 @@ class Params(object):
             elif def_dict[key]['type'] == "string":
                 instance = String(value, classname=classname)
             self.__setattr__(key, instance)
-            print("{} -> {}".format(key, value))
-        print("done")