Do not use variables that clash with builtins (id, range, type)

diff --git a/jenkinsapi/invocation.py b/jenkinsapi/invocation.py
index f578dabc31c4b575c6f39c66b49fefaef81cc8a0..264eb0a1518aaff77e7473b107d6fc2c80ae5486 100644 (file)
--- a/jenkinsapi/invocation.py
+++ b/jenkinsapi/invocation.py
@@ -30,7 +30,7 @@ class Invocation(object):
         self.job.poll()
         self.initial_builds = set(self.job.get_build_dict().keys())
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, type_, value, traceback):
         """
         Finish watching the job - it will track which new queue items or builds have
         been created as a consequence of invoking the job.

diff --git a/jenkinsapi/jenkins.py b/jenkinsapi/jenkins.py
index 6320e3d1bacfd4420ad73bce64de90efca0c6390..324335db44dfe4181808ceba5ab63ee117f5a443 100644 (file)
--- a/jenkinsapi/jenkins.py
+++ b/jenkinsapi/jenkins.py
@@ -49,17 +49,17 @@ class Jenkins(JenkinsBase):
         else:
             return self.baseurl
 
-    def validate_fingerprint(self, id):
-        obj_fingerprint = Fingerprint(self.baseurl, id, jenkins_obj=self)
+    def validate_fingerprint(self, id_):
+        obj_fingerprint = Fingerprint(self.baseurl, id_, jenkins_obj=self)
         obj_fingerprint.validate()
-        log.info(msg="Jenkins says %s is valid" % id)
+        log.info(msg="Jenkins says %s is valid" % id_)
 
     # def reload(self):
     #     '''Try and reload the configuration from disk'''
     #     self.requester.get_url("%(baseurl)s/reload" % self.__dict__)
 
-    def get_artifact_data(self, id):
-        obj_fingerprint = Fingerprint(self.baseurl, id, jenkins_obj=self)
+    def get_artifact_data(self, id_):
+        obj_fingerprint = Fingerprint(self.baseurl, id_, jenkins_obj=self)
         obj_fingerprint.validate()
         return obj_fingerprint.get_info()
 

diff --git a/jenkinsapi/result.py b/jenkinsapi/result.py
index 862999b2f40f859093303dfc88eafc68cc2c8184..f93e738e521cf3664af7f9bdf78b8bbd8575075e 100644 (file)
--- a/jenkinsapi/result.py
+++ b/jenkinsapi/result.py
@@ -19,8 +19,8 @@ class Result(object):
         self_str = str(self)
         return "<%s.%s %s>" % (module_name, class_name, self_str)
 
-    def id(self):
-        """
-        Calculate an ID for this object.
-        """
-        return "%s.%s" % (self.className, self.name)
+    #def id(self):
+    #    """
+    #    Calculate an ID for this object.
+    #    """
+    #    return "%s.%s" % (self.className, self.name)