From aae2f80fdd6717a4b2c78a5cd37e0263fa759078 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 25 May 2012 14:26:41 +0100 Subject: [PATCH 1/2] Make all Python pass pyflakes This found one bug, but will also help us with Jenkins testing of these scripts Change-Id: Iabe171645c06f769957db7cf0def1d10a0e47988 --- doc/conf.py | 2 +- modules/gerrit/files/scripts/close_pull_requests.py | 1 - modules/gerrit/files/scripts/expire_old_reviews.py | 1 - modules/gerrit/files/scripts/fetch_remotes.py | 5 +---- modules/gerrit/files/scripts/update_cla_group.py | 6 ------ modules/gerrit/files/scripts/update_gerrit_users.py | 4 +++- modules/gerrit/files/scripts/update_users.py | 3 ++- modules/jenkins_jobs/files/jenkins_jobs.py | 2 -- modules/jenkins_jobs/files/modules/publisher_tarball.py | 2 +- modules/jenkins_slave/files/slave_scripts/ping.py | 2 +- 10 files changed, 9 insertions(+), 19 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index eafad3cc3b..d54ab3ba2b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,7 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os, datetime +import datetime # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/modules/gerrit/files/scripts/close_pull_requests.py b/modules/gerrit/files/scripts/close_pull_requests.py index 0355e90d48..64160ed893 100755 --- a/modules/gerrit/files/scripts/close_pull_requests.py +++ b/modules/gerrit/files/scripts/close_pull_requests.py @@ -29,7 +29,6 @@ import github2.client import os -import StringIO import ConfigParser import logging import re diff --git a/modules/gerrit/files/scripts/expire_old_reviews.py b/modules/gerrit/files/scripts/expire_old_reviews.py index 1ba936e9d6..f9e908a67f 100644 --- a/modules/gerrit/files/scripts/expire_old_reviews.py +++ b/modules/gerrit/files/scripts/expire_old_reviews.py @@ -18,7 +18,6 @@ # 1. if open and no activity in 2 weeks, expire # 2. if negative comment and no activity in 1 week, expire -import os import paramiko import json import logging diff --git a/modules/gerrit/files/scripts/fetch_remotes.py b/modules/gerrit/files/scripts/fetch_remotes.py index 19df462fdf..7948c743c1 100755 --- a/modules/gerrit/files/scripts/fetch_remotes.py +++ b/modules/gerrit/files/scripts/fetch_remotes.py @@ -20,16 +20,13 @@ # remote = https://gerrit.googlesource.com/gerrit import ConfigParser -import StringIO import logging import os import re import subprocess - +import shlex def run_command(cmd, status=False, env={}): - if VERBOSE: - print datetime.datetime.now(), "Running:", cmd cmd_list = shlex.split(str(cmd)) newenv = os.environ newenv.update(env) diff --git a/modules/gerrit/files/scripts/update_cla_group.py b/modules/gerrit/files/scripts/update_cla_group.py index 91365a2fa4..d418cf0544 100755 --- a/modules/gerrit/files/scripts/update_cla_group.py +++ b/modules/gerrit/files/scripts/update_cla_group.py @@ -15,16 +15,10 @@ # Add launchpad ids listed in the wiki CLA page to the CLA group in LP. -import os -import sys -import uuid import os import urllib import re -import StringIO -import ConfigParser - from launchpadlib.launchpad import Launchpad from launchpadlib.uris import LPNET_SERVICE_ROOT diff --git a/modules/gerrit/files/scripts/update_gerrit_users.py b/modules/gerrit/files/scripts/update_gerrit_users.py index 68ac448412..15baaa9b79 100755 --- a/modules/gerrit/files/scripts/update_gerrit_users.py +++ b/modules/gerrit/files/scripts/update_gerrit_users.py @@ -19,7 +19,6 @@ import os import sys import fcntl import uuid -import os import subprocess from datetime import datetime @@ -42,6 +41,9 @@ from openid.cryptutil import randomString DEBUG = False +# suppress pyflakes +pkg_resources.get_supported_platform() + pid_file = '/tmp/update_gerrit_users.pid' fp = open(pid_file, 'w') try: diff --git a/modules/gerrit/files/scripts/update_users.py b/modules/gerrit/files/scripts/update_users.py index 5ff654b940..b40fbfdfd4 100644 --- a/modules/gerrit/files/scripts/update_users.py +++ b/modules/gerrit/files/scripts/update_users.py @@ -19,6 +19,7 @@ # 2. split out the two classes into separate files to be used as a library import os +import sys import ConfigParser import StringIO import paramiko @@ -301,7 +302,7 @@ class GerritAction(object): user_ssh_keys= ["%s %s %s" % ('ssh-%s' % key.keytype.lower(), key.keytext, key.comment) for key in user_data.sshkeys] user_email= None try: - email = user_data.preferred_email_address.email + user_email = user_data.preferred_email_address.email except ValueError: pass query= "insert into account_id (s) values (NULL)" diff --git a/modules/jenkins_jobs/files/jenkins_jobs.py b/modules/jenkins_jobs/files/jenkins_jobs.py index 0e8e0a749c..605cf1b116 100644 --- a/modules/jenkins_jobs/files/jenkins_jobs.py +++ b/modules/jenkins_jobs/files/jenkins_jobs.py @@ -19,10 +19,8 @@ import os import argparse import hashlib import yaml -import sys import xml.etree.ElementTree as XML from xml.dom import minidom -import pycurl import jenkins import ConfigParser from StringIO import StringIO diff --git a/modules/jenkins_jobs/files/modules/publisher_tarball.py b/modules/jenkins_jobs/files/modules/publisher_tarball.py index ce3464031d..0d1f1bf13e 100644 --- a/modules/jenkins_jobs/files/modules/publisher_tarball.py +++ b/modules/jenkins_jobs/files/modules/publisher_tarball.py @@ -42,7 +42,7 @@ class publisher_tarball(object): btrigger_config = XML.SubElement(btrigger_configs, 'hudson.plugins.parameterizedtrigger.BuildTriggerConfig') configs = XML.SubElement(btrigger_config, 'configs') parameters = XML.SubElement(configs, 'hudson.plugins.parameterizedtrigger.PredefinedBuildParameters') - properties = XML.SubElement(parameters, 'properties').text = 'BUILD_SELECTOR=<SpecificBuildSelector><buildNumber>$BUILD_NUMBER</buildNumber></SpecificBuildSelector>\n\ + XML.SubElement(parameters, 'properties').text = 'BUILD_SELECTOR=<SpecificBuildSelector><buildNumber>$BUILD_NUMBER</buildNumber></SpecificBuildSelector>\n\ BRANCH=$GERRIT_REFNAME' XML.SubElement(btrigger_config, 'projects').text = '{proj}-ppa'.format(proj=self.data['main']['project']) XML.SubElement(btrigger_config, 'condition').text = 'SUCCESS' diff --git a/modules/jenkins_slave/files/slave_scripts/ping.py b/modules/jenkins_slave/files/slave_scripts/ping.py index a359522e62..ad4474aaf9 100755 --- a/modules/jenkins_slave/files/slave_scripts/ping.py +++ b/modules/jenkins_slave/files/slave_scripts/ping.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from subprocess import * +from subprocess import Popen, PIPE p = Popen(["ping", sys.argv[1]], stdout=PIPE) while True: From 89efea8b5490da2d5d62abdf19d07a237a6602c9 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 25 May 2012 15:35:42 +0100 Subject: [PATCH 2/2] Add pyflakes to Jekins slaves In preperation for openstack-ci-puppet repo testing Change-Id: I76ad015ea22f4a5a77817828740c26557dacb8d2 --- modules/jenkins_slave/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp index 61d478b4fa..0cb84d19a8 100644 --- a/modules/jenkins_slave/manifests/init.pp +++ b/modules/jenkins_slave/manifests/init.pp @@ -73,7 +73,8 @@ class jenkins_slave($ssh_key, $sudo = false, $bare = false) { "swig", "unzip", "vlan", - "wget"] + "wget", + "pyflakes"] if ($bare == false) { $packages = [$common_packages, $standard_packages]