From: salimfadhley <sal@stodge.org>
Date: Fri, 11 Oct 2013 22:31:13 +0000 (+0100)
Subject: resolve conflicts
X-Git-Tag: v0.2.23~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c816c2535ed2173408d34eac7fe6dc38b497db18;p=tools%2Fpython-jenkinsapi.git

resolve conflicts
---

c816c2535ed2173408d34eac7fe6dc38b497db18
diff --cc jenkinsapi/job.py
index 3f4215b,c9709b5..721d4bd
--- a/jenkinsapi/job.py
+++ b/jenkinsapi/job.py
@@@ -131,8 -113,7 +133,8 @@@ class Job(JenkinsBase, MutableJenkinsTh
          to_json_structure = Job._mk_json_from_build_parameters(build_params)
          return json.dumps(to_json_structure)
  
 -    def invoke(self, securitytoken=None, block=False, skip_if_running=False, invoke_pre_check_delay=3, invoke_block_delay=15, build_params=None, cause=None, files=None):
 +    def invoke(self, securitytoken=None, block=False, skip_if_running=False, invoke_pre_check_delay=3,
-                invoke_block_delay=15, build_params=None, cause=None):
++               invoke_block_delay=15, build_params=None, cause=None, files=None):
          assert isinstance(invoke_pre_check_delay, (int, float))
          assert isinstance(invoke_block_delay, (int, float))
          assert isinstance(block, bool)
@@@ -169,14 -150,15 +171,16 @@@
              if securitytoken:
                  params['token'] = securitytoken
  
+             data = build_params
+ 
              response = self.jenkins.requester.post_and_confirm_status(
                  url,
-                 data={'json': self.mk_json_from_build_parameters(
-                     build_params)},  # See above - build params have to be JSON encoded & posted.
+                 data=data,
                  params=params,
+                 files=files,
                  valid=[200, 201]
              )
 +            response = response
              if invoke_pre_check_delay > 0:
                  log.info(
                      "Waiting for %is to allow Jenkins to catch up", invoke_pre_check_delay)
diff --cc jenkinsapi/utils/requester.py
index 3c0baad,cc3fc20..6127770
--- a/jenkinsapi/utils/requester.py
+++ b/jenkinsapi/utils/requester.py
@@@ -38,7 -34,7 +38,8 @@@ class Requester(object)
          self.password = password
          self.ssl_verify = ssl_verify
  
-     def get_request_dict(self, params, data, headers):
++
+     def get_request_dict(self, url, params=None, data=None, files=None, headers=None):
          requestKwargs = {}
          if self.username:
              requestKwargs['auth'] = (self.username, self.password)