Mercurial > hg
comparison mercurial/hgweb/webutil.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 | f53b7174facf |
children | 567ae5365754 |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
371 m = match.always(repo.root, repo.getcwd()) | 371 m = match.always(repo.root, repo.getcwd()) |
372 | 372 |
373 diffopts = patch.diffopts(repo.ui, untrusted=True) | 373 diffopts = patch.diffopts(repo.ui, untrusted=True) |
374 if basectx is None: | 374 if basectx is None: |
375 parents = ctx.parents() | 375 parents = ctx.parents() |
376 node1 = parents and parents[0].node() or nullid | 376 if parents: |
377 node1 = parents[0].node() | |
378 else: | |
379 node1 = nullid | |
377 else: | 380 else: |
378 node1 = basectx.node() | 381 node1 = basectx.node() |
379 node2 = ctx.node() | 382 node2 = ctx.node() |
380 | 383 |
381 block = [] | 384 block = [] |