Skip to content
Browse files

fixed inconsistent line indents. converted everything to spaces only

  • Loading branch information...
1 parent aaa4809 commit 88e2db4b0651ac4331a12c5161e6123cab2382c9 @brandonhamric brandonhamric committed May 20, 2013
Showing with 17 additions and 17 deletions.
  1. +17 −17 iron_worker.py
View
34 iron_worker.py
@@ -184,19 +184,19 @@ def merge(self, target, ignoreRootDir=False):
def merge_dependency(self, dep):
dependency = __import__(dep)
- location = os.path.dirname(dependency.__file__)
- print location
- parent = location.rstrip(os.path.basename(location))
- print parent
- for dirname, dirnames, filenames in os.walk(location):
- for filename in filenames:
- path = os.path.join(dirname, filename)
- if path.startswith(parent):
- newpath = path[len(parent):]
- else:
- newpath = path
- ziploc = newpath.lstrip("/")
- self.files[ziploc] = path
+ location = os.path.dirname(dependency.__file__)
+ print location
+ parent = location.rstrip(os.path.basename(location))
+ print parent
+ for dirname, dirnames, filenames in os.walk(location):
+ for filename in filenames:
+ path = os.path.join(dirname, filename)
+ if path.startswith(parent):
+ newpath = path[len(parent):]
+ else:
+ newpath = path
+ ziploc = newpath.lstrip("/")
+ self.files[ziploc] = path
def zip(self, destination=None, overwrite=True):
if destination is None:
@@ -391,15 +391,15 @@ def queue(self, task=None, tasks=None, retry=None, **kwargs):
if task.run_every is not None:
task_data["run_every"] = task.run_every
if task.end_at is not None:
- if task.end_at.tzinfo is None:
- task.end_at = task.end_at.replace(tzinfo=tzlocal())
+ if task.end_at.tzinfo is None:
+ task.end_at = task.end_at.replace(tzinfo=tzlocal())
task_data["end_at"] = iron_core.IronClient.toRfc3339(
task.end_at)
if task.run_times is not None:
task_data["run_times"] = task.run_times
if task.start_at is not None:
- if task.start_at.tzinfo is None:
- task.start_at = task.start_at.replace(tzinfo=tzlocal())
+ if task.start_at.tzinfo is None:
+ task.start_at = task.start_at.replace(tzinfo=tzlocal())
task_data["start_at"] = iron_core.IronClient.toRfc3339(
task.start_at)
tasks_data.append(task_data)

0 comments on commit 88e2db4

Please sign in to comment.
Something went wrong with that request. Please try again.