From 1da7996c3b46a6711985a0ef0baf024f5df65176 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 13 Nov 2015 22:27:41 +0100 Subject: [PATCH] Style fixes. --- qutebrowser/app.py | 9 +++------ qutebrowser/completion/models/configmodel.py | 4 ++-- qutebrowser/completion/models/instances.py | 2 +- qutebrowser/completion/models/miscmodels.py | 2 +- qutebrowser/config/config.py | 2 +- qutebrowser/config/parsers/keyconf.py | 4 +--- qutebrowser/utils/log.py | 6 ++---- qutebrowser/utils/urlutils.py | 10 ++-------- scripts/dev/get_coredumpctl_traces.py | 4 +--- scripts/dev/run_vulture.py | 6 +----- tests/conftest.py | 7 ++----- tests/unit/browser/test_cache.py | 4 ++-- 12 files changed, 19 insertions(+), 41 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 3b9cc55c1..0b37d683e 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -814,12 +814,9 @@ class EventFilter(QObject): Return: True if the event should be filtered, False if it's passed through. """ - if qApp.overrideCursor() is None: - # Mouse cursor shown -> don't filter event - return False - else: - # Mouse cursor hidden -> filter event - return True + # Mouse cursor shown (overrideCursor None) -> don't filter event + # Mouse cursor hidden (overrideCursor not None) -> filter event + return qApp.overrideCursor() is not None def eventFilter(self, obj, event): """Handle an event. diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py index 0c45d817b..efa1cf5af 100644 --- a/qutebrowser/completion/models/configmodel.py +++ b/qutebrowser/completion/models/configmodel.py @@ -37,7 +37,7 @@ class SettingSectionCompletionModel(base.BaseCompletionModel): def __init__(self, parent=None): super().__init__(parent) cat = self.new_category("Sections") - for name in configdata.DATA.keys(): + for name in configdata.DATA: desc = configdata.SECTION_DESC[name].splitlines()[0].strip() self.new_item(cat, name, desc) @@ -62,7 +62,7 @@ class SettingOptionCompletionModel(base.BaseCompletionModel): self._misc_items = {} self._section = section objreg.get('config').changed.connect(self.update_misc_column) - for name in sectdata.keys(): + for name in sectdata: try: desc = sectdata.descriptions[name] except (KeyError, AttributeError): diff --git a/qutebrowser/completion/models/instances.py b/qutebrowser/completion/models/instances.py index 7db82c8b6..deda7e195 100644 --- a/qutebrowser/completion/models/instances.py +++ b/qutebrowser/completion/models/instances.py @@ -70,7 +70,7 @@ def _init_setting_completions(): model = configmodel.SettingOptionCompletionModel(sectname) _instances[usertypes.Completion.option][sectname] = model _instances[usertypes.Completion.value][sectname] = {} - for opt in configdata.DATA[sectname].keys(): + for opt in configdata.DATA[sectname]: model = configmodel.SettingValueCompletionModel(sectname, opt) _instances[usertypes.Completion.value][sectname][opt] = model diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py index 2a1d9cfef..2d65959a5 100644 --- a/qutebrowser/completion/models/miscmodels.py +++ b/qutebrowser/completion/models/miscmodels.py @@ -77,7 +77,7 @@ class HelpCompletionModel(base.BaseCompletionModel): """Fill completion with section->option entries.""" cat = self.new_category("Settings") for sectname, sectdata in configdata.DATA.items(): - for optname in sectdata.keys(): + for optname in sectdata: try: desc = sectdata.descriptions[optname] except (KeyError, AttributeError): diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 09cde457e..aea69494b 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -368,7 +368,7 @@ class ConfigManager(QObject): self.sections = configdata.data() self._interpolation = configparser.ExtendedInterpolation() self._proxies = {} - for sectname in self.sections.keys(): + for sectname in self.sections: self._proxies[sectname] = SectionProxy(self, sectname) self._fname = fname if configdir is None: diff --git a/qutebrowser/config/parsers/keyconf.py b/qutebrowser/config/parsers/keyconf.py index 788ee27af..973818db1 100644 --- a/qutebrowser/config/parsers/keyconf.py +++ b/qutebrowser/config/parsers/keyconf.py @@ -273,10 +273,8 @@ class KeyConfigParser(QObject): return True if keychain in bindings: return False - elif command in bindings.values(): - return False else: - return True + return command not in bindings.values() def _read(self, relaxed=False): """Read the config file from disk and parse it. diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 2d615e4b3..686981924 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -371,10 +371,8 @@ class QtWarningFilter(logging.Filter): def filter(self, record): """Determine if the specified record is to be logged.""" - if record.msg.strip().startswith(self._pattern): - return False # filter - else: - return True # log + do_log = not record.msg.strip().startswith(self._pattern) + return do_log class LogFilter(logging.Filter): diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index e372dc65f..628877fea 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -122,10 +122,7 @@ def _is_url_naive(urlstr): if not QHostAddress(urlstr).isNull(): return False - if '.' in url.host(): - return True - else: - return False + return '.' in url.host() def _is_url_dns(urlstr): @@ -254,10 +251,7 @@ def is_url(urlstr): # no autosearch, so everything is a URL unless it has an explicit # search engine. engine, _term = _parse_search_term(urlstr) - if engine is None: - return True - else: - return False + return engine is None if not qurl_userinput.isValid(): # This will also catch URLs containing spaces. diff --git a/scripts/dev/get_coredumpctl_traces.py b/scripts/dev/get_coredumpctl_traces.py index 1102bf488..c3f39195b 100644 --- a/scripts/dev/get_coredumpctl_traces.py +++ b/scripts/dev/get_coredumpctl_traces.py @@ -93,10 +93,8 @@ def is_qutebrowser_dump(parsed): return True else: return '-m qutebrowser' in cmdline - elif basename == 'qutebrowser': - return True else: - return False + return basename == 'qutebrowser' def dump_infos_gdb(parsed): diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py index 4d9805332..702d0bace 100644 --- a/scripts/dev/run_vulture.py +++ b/scripts/dev/run_vulture.py @@ -110,11 +110,7 @@ def filter_func(item): True if the missing function should be filtered/ignored, False otherwise. """ - if re.match(r'[a-z]+[A-Z][a-zA-Z]+', str(item)): - # probably a virtual Qt method - return True - else: - return False + return bool(re.match(r'[a-z]+[A-Z][a-zA-Z]+', str(item))) def report(items): diff --git a/tests/conftest.py b/tests/conftest.py index 120865d8f..1a2f1ebca 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -121,11 +121,8 @@ def pytest_collection_modifyitems(items): def pytest_ignore_collect(path): """Ignore BDD tests during collection if frozen.""" rel_path = path.relto(os.path.dirname(__file__)) - if (rel_path == os.path.join('integration', 'features') and - hasattr(sys, 'frozen')): - return True - else: - return False + return (rel_path == os.path.join('integration', 'features') and + hasattr(sys, 'frozen')) @pytest.fixture(scope='session') diff --git a/tests/unit/browser/test_cache.py b/tests/unit/browser/test_cache.py index 2a269051b..5c61dc28b 100644 --- a/tests/unit/browser/test_cache.py +++ b/tests/unit/browser/test_cache.py @@ -147,7 +147,7 @@ def test_cache_nonexistent_metadata_file(config_stub, tmpdir): disk_cache = cache.DiskCache(str(tmpdir)) cache_file = disk_cache.fileMetaData("nosuchfile") - assert cache_file.isValid() == False + assert cache_file.isValid() def test_cache_deactivated_metadata_file(config_stub, tmpdir): @@ -207,7 +207,7 @@ def test_cache_deactivated_remove_data(config_stub, tmpdir): disk_cache = cache.DiskCache(str(tmpdir)) url = QUrl('http://www.example.com/') - assert disk_cache.remove(url) == False + assert disk_cache.remove(url) def test_cache_insert_data(config_stub, tmpdir):