comparison hgext/keyword.py @ 24306:6ddc86eedc3b

style: kill ersatz if-else ternary operators Although Python supports `X = Y if COND else Z`, this was only introduced in Python 2.5. Since we have to support Python 2.4, it was a very common thing to write instead `X = COND and Y or Z`, which is a bit obscure at a glance. It requires some intricate knowledge of Python to understand how to parse these one-liners. We change instead all of these one-liners to 4-liners. This was executed with the following perlism: find -name "*.py" -exec perl -pi -e 's,(\s*)([\.\w]+) = \(?(\S+)\s+and\s+(\S*)\)?\s+or\s+(\S*)$,$1if $3:\n$1 $2 = $4\n$1else:\n$1 $2 = $5,' {} \; I tweaked the following cases from the automatic Perl output: prev = (parents and parents[0]) or nullid port = (use_ssl and 443 or 80) cwd = (pats and repo.getcwd()) or '' rename = fctx and webutil.renamelink(fctx) or [] ctx = fctx and fctx or ctx self.base = (mapfile and os.path.dirname(mapfile)) or '' I also added some newlines wherever they seemd appropriate for readability There are probably a few ersatz ternary operators still in the code somewhere, lurking away from the power of a simple regex.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 13 Mar 2015 17:00:06 -0400
parents 26a1c617e047
children 109a2acc19ed
comparison
equal deleted inserted replaced
24305:867c3649be5d 24306:6ddc86eedc3b
504 i = ignored (not tracked) 504 i = ignored (not tracked)
505 ''' 505 '''
506 kwt = kwtools['templater'] 506 kwt = kwtools['templater']
507 wctx = repo[None] 507 wctx = repo[None]
508 status = _status(ui, repo, wctx, kwt, *pats, **opts) 508 status = _status(ui, repo, wctx, kwt, *pats, **opts)
509 cwd = pats and repo.getcwd() or '' 509 if pats:
510 cwd = repo.getcwd()
511 else:
512 cwd = ''
510 files = [] 513 files = []
511 if not opts.get('unknown') or opts.get('all'): 514 if not opts.get('unknown') or opts.get('all'):
512 files = sorted(status.modified + status.added + status.clean) 515 files = sorted(status.modified + status.added + status.clean)
513 kwfiles = kwt.iskwfile(files, wctx) 516 kwfiles = kwt.iskwfile(files, wctx)
514 kwdeleted = kwt.iskwfile(status.deleted, wctx) 517 kwdeleted = kwt.iskwfile(status.deleted, wctx)