qutebrowser: 1.8.3 -> 1.9.0

Closes #77360
2020-01-10 16:05:17 +07:00
parent 5934692d6a
commit 216dea5b9d
2 changed files with 7 additions and 16 deletions
@@ -1,29 +1,20 @@
 diff --git a/qutebrowser/app.py b/qutebrowser/app.py
-index 2b6896b76..ee05f379d 100644
+index a47b5d2f4..f23ee23ef 100644
 --- a/qutebrowser/app.py
 +++ b/qutebrowser/app.py
-@@ -555,22 +555,8 @@ class Quitter:
-                 args: The commandline as a list of strings.
-                 cwd: The current working directory as a string.
+@@ -573,13 +573,8 @@ class Quitter(QObject):
+         Return:
+             The commandline as a list of strings.
         """
 -        if os.path.basename(sys.argv[0]) == 'qutebrowser':
 -            # Launched via launcher script
 -            args = [sys.argv[0]]
-            cwd = None
 -        elif hasattr(sys, 'frozen'):
 -            args = [sys.executable]
-            cwd = os.path.abspath(os.path.dirname(sys.executable))
 -        else:
 -            args = [sys.executable, '-m', 'qutebrowser']
-            cwd = os.path.join(
-                os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
-            if not os.path.isdir(cwd):
-                # Probably running from a python egg. Let's fallback to
-                # cwd=None and see if that works out.
-                # See https://github.com/qutebrowser/qutebrowser/issues/323
-                cwd = None
 +        args = ['@qutebrowser@']
 +        cwd = None
 
         # Add all open pages so they get reopened.
-         page_args = []
+         page_args = []  # type: typing.MutableSequence[str]