Mercurial > hg
comparison mercurial/httpclient/__init__.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 | c48df403caae |
children | 328739ea70c3 |
comparison
equal
deleted
inserted
replaced
24305:867c3649be5d | 24306:6ddc86eedc3b |
---|---|
328 use_ssl = False | 328 use_ssl = False |
329 port = 80 | 329 port = 80 |
330 elif use_ssl is None: | 330 elif use_ssl is None: |
331 use_ssl = (port == 443) | 331 use_ssl = (port == 443) |
332 elif port is None: | 332 elif port is None: |
333 port = (use_ssl and 443 or 80) | 333 if use_ssl: |
334 port = 443 | |
335 else: | |
336 port = 80 | |
334 self.port = port | 337 self.port = port |
335 if use_ssl and not socketutil.have_ssl: | 338 if use_ssl and not socketutil.have_ssl: |
336 raise Exception('ssl requested but unavailable on this Python') | 339 raise Exception('ssl requested but unavailable on this Python') |
337 self.ssl = use_ssl | 340 self.ssl = use_ssl |
338 self.ssl_opts = ssl_opts | 341 self.ssl_opts = ssl_opts |