From f889edabfac56baa39e0ec078c01bd47eb745cf7 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Mon, 27 May 2013 14:56:24 +0200 Subject: [PATCH] core.py: add missing spaces Add missing spaces around operators and spaces after comma. Signed-off-by: Danny Al-Gaaf --- osc/core.py | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/osc/core.py b/osc/core.py index 6a1fd032..5ac40cab 100644 --- a/osc/core.py +++ b/osc/core.py @@ -1423,7 +1423,7 @@ class Package: # if sinfo is None another commit might have occured in the "meantime" sinfo = sfilelist.find('serviceinfo') print('') - rev=self.latest_rev() + rev = self.latest_rev() self.update(rev=rev) def __write_storelist(self, name, data): @@ -2633,9 +2633,9 @@ def shorttime(t): if time.localtime()[0] == time.localtime(t)[0]: # same year - return time.strftime('%b %d %H:%M',time.localtime(t)) + return time.strftime('%b %d %H:%M', time.localtime(t)) else: - return time.strftime('%b %d %Y',time.localtime(t)) + return time.strftime('%b %d %Y', time.localtime(t)) def is_project_dir(d): @@ -2935,7 +2935,7 @@ def http_request(method, url, headers={}, data=None, file=None, timeout=100): socket.setdefaulttimeout(timeout) try: if isinstance(data, str): - data=bytes(data, "utf-8") + data = bytes(data, "utf-8") fd = urlopen(req, data=data) finally: @@ -3084,7 +3084,7 @@ def show_package_meta(apiurl, prj, pac, meta=False): def show_attribute_meta(apiurl, prj, pac, subpac, attribute, with_defaults, with_project): - path=[] + path = [] path.append('source') path.append(prj) if pac: @@ -3094,7 +3094,7 @@ def show_attribute_meta(apiurl, prj, pac, subpac, attribute, with_defaults, with path.append('_attribute') if attribute: path.append(attribute) - query=[] + query = [] if with_defaults: query.append("with_default=1") if with_project: @@ -3303,7 +3303,7 @@ def edit_meta(metatype, change_is_required = True url = make_meta_url(metatype, path_args, apiurl, force, remove_linking_repositories) - f=metafile(url, data, change_is_required, metatypes[metatype]['file_ext']) + f = metafile(url, data, change_is_required, metatypes[metatype]['file_ext']) if edit: f.edit() @@ -3586,20 +3586,20 @@ def create_submit_request(apiurl, message="", orev=None, src_update=None): import cgi - options_block="" - package="" + options_block = "" + package = "" if src_package: - package="""package="%s" """ % (src_package) + package = """package="%s" """ % (src_package) if src_update: - options_block="""%s """ % (src_update) + options_block = """%s """ % (src_update) # Yes, this kind of xml construction is horrible targetxml = "" if dst_project: packagexml = "" if dst_package: - packagexml = """package="%s" """ %( dst_package ) - targetxml = """ """ %( dst_project, packagexml ) + packagexml = """package="%s" """ % ( dst_package ) + targetxml = """ """ % ( dst_project, packagexml ) # XXX: keep the old template for now in order to work with old obs instances xml = """\ @@ -3676,7 +3676,7 @@ def change_review_state(apiurl, reqid, newstate, by_user='', by_group='', by_pro return root.get('code') def change_request_state(apiurl, reqid, newstate, message='', supersed=None, force=False): - query={'cmd': 'changestate', 'newstate': newstate } + query = {'cmd': 'changestate', 'newstate': newstate } if supersed: query['superseded_by'] = supersed if force: @@ -3768,7 +3768,7 @@ def get_review_list(apiurl, project='', package='', byuser='', bygroup='', bypro requests.append(r) return requests -def get_exact_request_list(apiurl, src_project, dst_project, src_package=None, dst_package=None, req_who=None, req_state=('new','review','declined'), req_type=None): +def get_exact_request_list(apiurl, src_project, dst_project, src_package=None, dst_package=None, req_who=None, req_state=('new', 'review', 'declined'), req_type=None): xpath = '' if not 'all' in req_state: for state in req_state: @@ -3799,7 +3799,7 @@ def get_exact_request_list(apiurl, src_project, dst_project, src_package=None, d requests.append(r) return requests -def get_request_list(apiurl, project='', package='', req_who='', req_state=('new','review','declined'), req_type=None, exclude_target_projects=[]): +def get_request_list(apiurl, project='', package='', req_who='', req_state=('new', 'review', 'declined'), req_type=None, exclude_target_projects=[]): xpath = '' if not 'all' in req_state: for state in req_state: @@ -3841,7 +3841,7 @@ def get_request_list(apiurl, project='', package='', req_who='', req_state=('new return requests # old style search, this is to be removed -def get_user_projpkgs_request_list(apiurl, user, req_state=('new','review',), req_type=None, exclude_projects=[], projpkgs={}): +def get_user_projpkgs_request_list(apiurl, user, req_state=('new', 'review', ), req_type=None, exclude_projects=[], projpkgs={}): """OBSOLETE: user involved request search is supported by OBS 2.2 server side in a better way Return all running requests for all projects/packages where is user is involved""" if not projpkgs: @@ -4716,18 +4716,18 @@ def copy_pac(src_apiurl, src_project, src_package, def unlock_package(apiurl, prj, pac, msg): - query={'cmd': 'unlock', 'comment': msg} + query = {'cmd': 'unlock', 'comment': msg} u = makeurl(apiurl, ['source', prj, pac], query) http_POST(u) def unlock_project(apiurl, prj, msg=None): - query={'cmd': 'unlock', 'comment': msg} + query = {'cmd': 'unlock', 'comment': msg} u = makeurl(apiurl, ['source', prj], query) http_POST(u) def undelete_package(apiurl, prj, pac, msg=None): - query={'cmd': 'undelete'} + query = {'cmd': 'undelete'} if msg: query['comment'] = msg else: @@ -4736,7 +4736,7 @@ def undelete_package(apiurl, prj, pac, msg=None): http_POST(u) def undelete_project(apiurl, prj, msg=None): - query={'cmd': 'undelete'} + query = {'cmd': 'undelete'} if msg: query['comment'] = msg else: @@ -4969,20 +4969,20 @@ def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], ve else: res['status'] += ': %s' % (res['details'], ) if res['dirty']: - waiting=True + waiting = True if verbose: res['status'] = 'outdated (was: %s)' % res['status'] else: res['status'] += '*' if res['code'] in ('blocked', 'scheduled', 'dispatching', 'building', 'signing', 'finished'): - waiting=True + waiting = True r.append(result_line_templ % res) if printJoin: print(printJoin.join(r)) - if wait==False or waiting==False: + if wait == False or waiting == False: break return r @@ -5358,7 +5358,7 @@ def print_jobhistory(apiurl, prj, current_package, repository, arch, format = 't et = int(node.get('endtime')) endtime = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(et)) waittm = time.gmtime(et-st) - if waittm.tm_mday>1: + if waittm.tm_mday > 1: waitbuild = "%1dd %2dh %2dm %2ds" % (waittm.tm_mday-1, waittm.tm_hour, waittm.tm_min, waittm.tm_sec) elif waittm.tm_hour: waitbuild = " %2dh %2dm %2ds" % (waittm.tm_hour, waittm.tm_min, waittm.tm_sec) @@ -5435,7 +5435,7 @@ def get_commitlog(apiurl, prj, package, revision, format = 'text', meta = False, r.append('') else: if requestid: - requestid="rq" + requestid + requestid = "rq" + requestid s = '-' * 76 + \ '\nr%s | %s | %s | %s | %s | %s\n' % (rev, user, t, srcmd5, version, requestid) + \ '\n' + comment @@ -5833,7 +5833,7 @@ def set_link_rev(apiurl, project, package, revision='', expand=False, baserev=Fa # set revision element src_project = root.get('project', project) src_package = root.get('package', package) - linkrev=None + linkrev = None vrev = None if baserev: linkrev = 'base' @@ -6298,7 +6298,7 @@ def get_commit_msg(wc_dir, pacs): store_unlink_file(wc_dir, '_commit_msg') return msg -def print_request_list(apiurl, project, package = None, states = ('new','review',), force = False): +def print_request_list(apiurl, project, package = None, states = ('new', 'review', ), force = False): """ prints list of pending requests for the specified project/package if "check_for_request_on_action" is enabled in the config or if "force" is set to True