Skip to content

Commit

Permalink
get_from_post -> getFromKwargs
Browse files Browse the repository at this point in the history
  • Loading branch information
John Carr committed Apr 25, 2012
1 parent f85564c commit 978414f
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions master/buildbot/schedulers/forcesched.py
Expand Up @@ -40,7 +40,7 @@ def __init__(self, name, label=None, regex=None, **kw):
# all other properties are generically passed via **kw
self.__dict__.update(kw)

def get_from_post(self, kwargs):
def getFromKwargs(self, kwargs):
args = kwargs.get(self.name, [])
if len(args) == 0:
if self.required:
Expand All @@ -67,8 +67,8 @@ def get_from_post(self, kwargs):
% (self.name,))
return arg

def update_from_post(self, master, properties, changes, kwargs):
properties[self.name] = self.get_from_post(kwargs)
def updateFromKwargs(self, master, properties, changes, kwargs):
properties[self.name] = self.getFromKwargs(kwargs)

def parse_from_args(self, l):
if self.multiple:
Expand Down Expand Up @@ -115,7 +115,7 @@ class IntParameter(StringParameter):
class BooleanParameter(BaseParameter):
type = "bool"

def get_from_post(self, kwargs):
def getFromKwargs(self, kwargs):
return self.name in kwargs and kwargs[self.name] == True


Expand Down Expand Up @@ -154,10 +154,10 @@ class InheritBuildParameter(ChoiceStringParameter):
name = "inherit"
compatible_builds = None

def get_from_post(self, kwargs):
def getFromKwargs(self, kwargs):
raise ValueError("InheritBuildParameter can only be used by properties")

def update_from_post(self, master, properties, changes, kwargs):
def updateFromKwargs(self, master, properties, changes, kwargs):
arg = kwargs.get(self.name, [""])[0]
splitted_arg = arg.split(" ")[0].split("/")
if len(splitted_arg) != 2:
Expand All @@ -182,10 +182,10 @@ def update_from_post(self, master, properties, changes, kwargs):
class AnyPropertyParameter(BaseParameter):
type = "anyproperty"

def get_from_post(self, kwargs):
def getFromKwargs(self, kwargs):
raise ValueError("AnyPropertyParameter can only be used by properties")

def update_from_post(self, master, properties, changes, kwargs):
def updateFromKwargs(self, master, properties, changes, kwargs):
validation = master.config.validation
pname = kwargs.get("%sname" % self.name, [""])[0]
pvalue = kwargs.get("%svalue" % self.name, [""])[0]
Expand Down Expand Up @@ -244,7 +244,7 @@ def gatherPropertiesAndChanges(self, **kwargs):
changeids = []

for param in self.forcedProperties:
yield defer.maybeDeferred(param.update_from_post, self.master, properties, changeids, kwargs)
yield defer.maybeDeferred(param.updateFromKwargs, self.master, properties, changeids, kwargs)

changeids = map(lambda a: type(a)==int and a or a.number, changeids)

Expand Down Expand Up @@ -286,13 +286,13 @@ def force(self, owner, builder_name, **kwargs):
if self.revision.regex == None:
self.revision.regex = validation['revision']

reason = self.reason.get_from_post(kwargs)
branch = self.branch.get_from_post(kwargs)
revision = self.revision.get_from_post(kwargs)
repository = self.repository.get_from_post(kwargs)
project = self.project.get_from_post(kwargs)
reason = self.reason.getFromKwargs(kwargs)
branch = self.branch.getFromKwargs(kwargs)
revision = self.revision.getFromKwargs(kwargs)
repository = self.repository.getFromKwargs(kwargs)
project = self.project.getFromKwargs(kwargs)
if owner is None:
owner = self.owner.get_from_post(kwargs)
owner = self.owner.getFromKwargs(kwargs)

properties, changeids = yield self.gatherPropertiesAndChanges(**kwargs)

Expand Down

0 comments on commit 978414f

Please sign in to comment.