Mercurial > public > mercurial-scm > hg
comparison mercurial/byterange.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 | 542110817450 |
children | 328739ea70c3 |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
272 dirs, file = dirs[:-1], dirs[-1] | 272 dirs, file = dirs[:-1], dirs[-1] |
273 if dirs and not dirs[0]: | 273 if dirs and not dirs[0]: |
274 dirs = dirs[1:] | 274 dirs = dirs[1:] |
275 try: | 275 try: |
276 fw = self.connect_ftp(user, passwd, host, port, dirs) | 276 fw = self.connect_ftp(user, passwd, host, port, dirs) |
277 type = file and 'I' or 'D' | 277 if file: |
278 type = 'I' | |
279 else: | |
280 type = 'D' | |
281 | |
278 for attr in attrs: | 282 for attr in attrs: |
279 attr, value = splitattr(attr) | 283 attr, value = splitattr(attr) |
280 if attr.lower() == 'type' and \ | 284 if attr.lower() == 'type' and \ |
281 value in ('a', 'A', 'i', 'I', 'd', 'D'): | 285 value in ('a', 'A', 'i', 'I', 'd', 'D'): |
282 type = value.upper() | 286 type = value.upper() |