Commit Graph

12886 Commits

Author SHA1 Message Date
Ryan Roden-Corrent
a8b0a42791 Remove extra blank line from utilcmds 2017-09-08 08:00:29 -04:00
Ryan Roden-Corrent
deb6cccff9 Fix merge resolution in messageview.
Remove a line that was acidentally re-added while merging master into
new-config.
2017-09-07 12:08:26 -04:00
Ryan Roden-Corrent
a6d14ad7dc Fix two new-config/master merge resolutions.
Remove icon from jinja.render call (removed in master).
Add 'When the unwritable dir is unwritable' to download feature file.
2017-09-07 08:58:55 -04:00
Ryan Roden-Corrent
607c64742c Fix configmodel nitpicks 2017-09-07 08:56:11 -04:00
Ryan Roden-Corrent
f0509d1c26 Fix web_history_max_items default value.
Should default to -1, not 1000 as the new history completion is better
able to handle large numbers of entries. I believe this was acidentally
reset to 1000 while fixing a merge conflict.

Also re-run src2asciidoc.
2017-09-07 08:45:05 -04:00
Ryan Roden-Corrent
6e0f65c063 Remove duplicate line from pytest.ini. 2017-09-07 07:34:26 -04:00
Ryan Roden-Corrent
aec736439c Restore history cache stats.
Acidentally removed in merge.
2017-09-07 07:32:51 -04:00
Ryan Roden-Corrent
63e0574411 Remove stray FIXME:conf 2017-09-07 07:32:46 -04:00
Ryan Roden-Corrent
a5ecb75fcd Really avoid flakiness in test_models.
Ensure the OrderedDict is actually ordered consistently.
2017-09-05 07:52:42 -04:00
Ryan Roden-Corrent
3726502017 Fix bad merge from master to newconfig. 2017-09-05 07:44:36 -04:00
Ryan Roden-Corrent
fc02216754 Avoid flakiness in test_models.
Ensure config values are ordered consistently by using an OrderedDict.
2017-09-04 16:30:54 -04:00
Ryan Roden-Corrent
0d78c72018 Remove config dependency from get_cmd_completions.
In order to really resolve the python3.4 circular import, this should
take the completion info as an argument and not depend on the config
module.
2017-09-04 15:00:35 -04:00
Ryan Roden-Corrent
3bfa01f0d0 Pass CompletionInfo to completion functions.
In python3.4, there is a circular dependency between the config module
and configmodel.bind. This is resolved by dependency injection. The
config/keyconfig instances are embedded in a struct passed to every
completion function, so the functions no longer depend on the modules.

This will also enable completion functions to access other previously
inaccessible info, such as the window id.
See #2814.
2017-09-04 14:01:48 -04:00
Ryan Roden-Corrent
6a292f9d56 Merge quteurls.feature into qutescheme.feature. 2017-08-28 07:18:14 -04:00
Ryan Roden-Corrent
61a03a7808 Add quteurls.feature
Move Scenario: Open qute://version from misc.feature to quteurls.feature
See #2779.
2017-08-27 22:37:04 -04:00
Ryan Roden-Corrent
37ba256900 Ensure web-history-max-items has int64 as maxval.
See #2779.
2017-08-27 22:29:01 -04:00
Ryan Roden-Corrent
d2d55531e6 Remove double-registration of proxy factory.
Due to a bad merge, proxy.init() was called twice.
2017-08-27 22:27:34 -04:00
Ryan Roden-Corrent
111846a909 Merge remote-tracking branch 'upstream/master' into configmerge 2017-08-20 21:18:47 -04:00
Ryan Roden-Corrent
722137ab29 Fix 2 end2end tests for config/completion merge. 2017-08-20 21:15:25 -04:00
Ryan Roden-Corrent
b5a6583559 Fix pylint/flake8/vulture errors. 2017-08-20 21:12:38 -04:00
Ryan Roden-Corrent
90c49b3fe7 Move bind completion to configmodels.
When in miscmodels, the config module was unable to find the function.
It appears to be some sort of circular import issue:

```
  File "/home/rcorre/projects/contrib/qutebrowser/qutebrowser/app.py", line 44, in <module>
    from qutebrowser.completion.models import miscmodels
  File "/home/rcorre/projects/contrib/qutebrowser/qutebrowser/completion/models/miscmodels.py", line 24, in <module>
    from qutebrowser.completion.models import completionmodel, listcategory, util
  File "/home/rcorre/projects/contrib/qutebrowser/qutebrowser/completion/models/util.py", line 24, in <module>
    from qutebrowser.config import config
  File "/home/rcorre/projects/contrib/qutebrowser/qutebrowser/config/config.py", line 223, in <module>
    class ConfigCommands:
  File "/home/rcorre/projects/contrib/qutebrowser/qutebrowser/config/config.py", line 314, in ConfigCommands
    @cmdutils.argument('command', completion=miscmodels.bind)
AttributeError: module 'qutebrowser.completion.models.miscmodels' has no attribute 'bind'
```

As configmodel imports util (and thereby config as well) it is unclear
to me why moving bind() to configmodel actually fixes this, but it does.
2017-08-20 21:12:38 -04:00
Ryan Roden-Corrent
0286e9ddf2 Fix completion tests after config merge. 2017-08-20 21:12:38 -04:00
Florian Bruhin
173688c748 Merge pull request #2904 from qutebrowser/pyup-scheduled-update-08-14-2017
Scheduled weekly dependency update for week 33
2017-08-14 22:11:12 +02:00
pyup-bot
7b1f3e36de Update vulture from 0.22 to 0.24 2017-08-14 16:19:24 +02:00
pyup-bot
bda5ac9bbf Update vulture from 0.22 to 0.24 2017-08-14 16:19:22 +02:00
pyup-bot
1581a68082 Update pytest from 3.2.0 to 3.2.1 2017-08-14 16:19:21 +02:00
pyup-bot
d0d27e7fb1 Update hypothesis from 3.16.1 to 3.18.0 2017-08-14 16:19:20 +02:00
pyup-bot
4f49e58d52 Update cheroot from 5.8.2 to 5.8.3 2017-08-14 16:19:18 +02:00
pyup-bot
29cc8ed272 Update wrapt from 1.10.10 to 1.10.11 2017-08-14 16:19:17 +02:00
pyup-bot
c00d35ea73 Update wrapt from 1.10.10 to 1.10.11 2017-08-14 16:19:16 +02:00
pyup-bot
f5ee01ab6a Update idna from 2.5 to 2.6 2017-08-14 16:19:14 +02:00
pyup-bot
5ebbe80cfe Update idna from 2.5 to 2.6 2017-08-14 16:19:13 +02:00
pyup-bot
843f14042b Update idna from 2.5 to 2.6 2017-08-14 16:19:11 +02:00
Florian Bruhin
1941071f87 Merge pull request #2901 from lachs0r/master
INSTALL: update openSUSE install instructions
2017-08-13 20:06:36 +02:00
Martin Herkt
dd8b5fc638
INSTALL: update openSUSE install instructions 2017-08-13 19:56:17 +02:00
Florian Bruhin
2957c4e55f Merge pull request #2899 from cryzed/jseval-expand-tilde
Expand ~ to user's home on Linux
2017-08-13 08:53:14 +02:00
cryzed
6ef53c814c Expand ~ to user's home on Linux 2017-08-13 02:34:50 +02:00
Florian Bruhin
ba04822388 Use develop branch of PyInstaller
https://github.com/pyinstaller/pyinstaller/pull/2519 was merged.
Fixes #2880
2017-08-10 17:24:41 +02:00
Ryan Roden-Corrent
5ea420b49b Fix startup crashes after config merge.
Get qutebrowser to the point where it can at least start

- Declare _messages earlier in MessageView.__init__ so it is set before
  the config trigger tries to access it.
- Remove unused configmodel completion functions
- Move bind completion to configmodel to avoid a circular import with
  the config module
- Fix some config accesses (forgot to use .val)
- Fix old Completion.CompletionKind references
2017-08-09 07:28:22 -04:00
Florian Bruhin
3a2d64ba46 version.distribution(): Handle Funtoo 2017-08-08 20:19:33 +02:00
Florian Bruhin
5f4ecd7efc Merge pull request #2892 from qutebrowser/pyup-scheduled-update-08-07-2017
Scheduled weekly dependency update for week 32
2017-08-08 07:59:27 +02:00
Florian Bruhin
a20f017c7a Sort sessions in SessionMnager.list_sessions() 2017-08-08 07:56:10 +02:00
Florian Bruhin
b7a296c81f Merge branch 'tabsort' of https://github.com/rcorre/qutebrowser 2017-08-08 07:53:22 +02:00
Florian Bruhin
81b260998d Ignore a new Geoclue error during tests 2017-08-08 06:25:50 +02:00
pyup-bot
3179599c31 Update vulture from 0.21 to 0.22 2017-08-07 16:16:30 +02:00
pyup-bot
9da802eadf Update vulture from 0.21 to 0.22 2017-08-07 16:16:28 +02:00
pyup-bot
e47e22ba28 Update pytest from 3.1.3 to 3.2.0 2017-08-07 16:16:27 +02:00
pyup-bot
d77ecc8218 Update hypothesis from 3.14.0 to 3.16.1 2017-08-07 16:16:25 +02:00
pyup-bot
af5872bc83 Update cheroot from 5.7.0 to 5.8.2 2017-08-07 16:16:24 +02:00
pyup-bot
fbb2a175ff Update docutils from 0.13.1 to 0.14 2017-08-07 16:16:22 +02:00