From b6b36cc8edaf78d0f4a66404d0b803348aa93a40 Mon Sep 17 00:00:00 2001 From: pepperpepperpepper Date: Mon, 7 Dec 2015 17:53:14 -0800 Subject: now works locally and remotely, both photoblaster and ricky, just need to fix paths --- example.py | 2 +- ricky/pb.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/example.py b/example.py index 5a781df..6d8b199 100755 --- a/example.py +++ b/example.py @@ -8,7 +8,7 @@ from ricky.pbpattern import PbPattern api = PbBreaker() params = api.params_init() print params -params.randomize(probabilities_local=True) +params.randomize() print params print params.execute() #print params['color1'] diff --git a/ricky/pb.py b/ricky/pb.py index d600708..2b07737 100644 --- a/ricky/pb.py +++ b/ricky/pb.py @@ -42,11 +42,14 @@ class Pb(object): if self._offline: sys.path.append("./photoblaster") from photoblaster.modules import Pb + from photoblaster.config import LOCAL as PBLOCAL for pbcls in Pb.__subclasses__(): if pbcls.__name__ == self.__class__.__name__: params_dict = params.as_dict() instance = pbcls(**params_dict) instance.create() + if not PBLOCAL: + instance.file_s3move() return instance.file_dict() return json.loads( self.post_request(self.url, params.as_dict()) -- cgit v1.2.3-70-g09d2