rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use generator expressions where possible.

Browse Source
This commit is contained in:
Florian Bruhin 2014-02-10 08:21:09 +01:00
parent ba3a56989e
commit e49a0aa0ed
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/utils/url.py
View File

@ -92,7 +92,7 @@ def _is_url_naive(url):
"""Naive check if given url (QUrl) is really an url.""" """Naive check if given url (QUrl) is really an url."""
PROTOCOLS = ['http://', 'https://'] PROTOCOLS = ['http://', 'https://']
u = urlstring(url) u = urlstring(url)
return (any([u.startswith(proto) for proto in PROTOCOLS]) or '.' in u or return (any(u.startswith(proto) for proto in PROTOCOLS) or '.' in u or
is_about_url(url) or u == 'localhost') is_about_url(url) or u == 'localhost')

4
qutebrowser/widgets/browser.py
View File

@ -398,7 +398,7 @@ class TabbedBrowser(TabWidget):
# - Switch back to #1 when loading finished # - Switch back to #1 when loading finished
# - It seems loadingStarted is before loadingFinished # - It seems loadingStarted is before loadingFinished
dbgstr = "{} ({})".format( dbgstr = "{} ({})".format(
signal.signal, ','.join([str(e) for e in args])) signal.signal, ','.join(str(e) for e in args))
sender = self.sender() sender = self.sender()
if not isinstance(sender, BrowserTab): if not isinstance(sender, BrowserTab):
# FIXME why does this happen? # FIXME why does this happen?
@ -427,7 +427,7 @@ class TabbedBrowser(TabWidget):
""" """
for (sigstr, (signal, args)) in self.widget(idx).signal_cache.items(): for (sigstr, (signal, args)) in self.widget(idx).signal_cache.items():
dbgstr = "{} ({})".format(sigstr, ','.join([str(e) for e in args])) dbgstr = "{} ({})".format(sigstr, ','.join(str(e) for e in args))
logging.debug('signal cache: emitting {}'.format(dbgstr)) logging.debug('signal cache: emitting {}'.format(dbgstr))
signal.emit(*args) signal.emit(*args)

6
run_checks.py
View File

@ -119,7 +119,7 @@ def check_line():
ret = [] ret = []
try: try:
for (dirpath, dirnames, filenames) in os.walk(options['target']): for (dirpath, dirnames, filenames) in os.walk(options['target']):
for name in [e for e in filenames if e.endswith('.py')]: for name in (e for e in filenames if e.endswith('.py')):
fn = os.path.join(dirpath, name) fn = os.path.join(dirpath, name)
ret.append(_check_line(fn)) ret.append(_check_line(fn))
status['line'] = all(ret) status['line'] = all(ret)
@ -134,7 +134,7 @@ def _check_line(fn):
if b'\r\n' in line: if b'\r\n' in line:
print('Found CRLF in {}'.format(fn)) print('Found CRLF in {}'.format(fn))
return False return False
elif any([line.decode('UTF-8').startswith(c * 7) for c in "<>=|"]): elif any(line.decode('UTF-8').startswith(c * 7) for c in "<>=|"):
print('Found conflict marker in {}'.format(fn)) print('Found conflict marker in {}'.format(fn))
return False return False
elif any([line.decode('UTF-8').rstrip('\r\n').endswith(c) elif any([line.decode('UTF-8').rstrip('\r\n').endswith(c)
@ -182,7 +182,7 @@ print('Exit status values:')
for (k, v) in status.items(): for (k, v) in status.items():
print(' {} - {}'.format(k, v)) print(' {} - {}'.format(k, v))
if all([val in [True, 0] for val in status]): if all(val in [True, 0] for val in status):
sys.exit(0) sys.exit(0)
else: else:
sys.exit(1) sys.exit(1)