Rename version.version() to version_info()

To get a less generic name.

5 files changed, 12 insertions, 12 deletions

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 6d01e0ddd..9621882e9 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -96,7 +96,7 @@ def run(args):
     q_app.setApplicationVersion(qutebrowser.__version__)
 
     if args.version:
-        print(version.version())
+        print(version.version_info())
         sys.exit(usertypes.Exit.ok)
 
     quitter.init(args)
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 53004e66a..ec6e19082 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -302,7 +302,7 @@ def qute_spawn_output(_url: QUrl) -> _HandlerRet:
 def qute_version(_url):
     """Handler for qute://version."""
     src = jinja.render('version.html', title='Version info',
-                       version=version.version(),
+                       version=version.version_info(),
                        copyright=qutebrowser.__copyright__)
     return 'text/html', src
 
diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 6bd6ec325..0f6d02712 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -246,7 +246,7 @@ class _CrashDialog(QDialog):
         except Exception:
             self._crash_info.append(("Launch time", traceback.format_exc()))
         try:
-            self._crash_info.append(("Version info", version.version()))
+            self._crash_info.append(("Version info", version.version_info()))
         except Exception:
             self._crash_info.append(("Version info", traceback.format_exc()))
         try:
@@ -650,7 +650,7 @@ def dump_exception_info(exc, pages, cmdhist, qobjects):
     print(''.join(traceback.format_exception(*exc)), file=sys.stderr)
     print("\n---- Version info ----", file=sys.stderr)
     try:
-        print(version.version(), file=sys.stderr)
+        print(version.version_info(), file=sys.stderr)
     except Exception:
         traceback.print_exc()
     print("\n---- Config ----", file=sys.stderr)
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 9c8c8f9e8..c0ff7e1ac 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -412,7 +412,7 @@ def _config_py_loaded() -> str:
         return "no config.py was loaded"
 
 
-def version() -> str:
+def version_info() -> str:
     """Return a string with various version information."""
     lines = ["qutebrowser v{}".format(qutebrowser.__version__)]
     gitver = _git_str()
@@ -646,5 +646,5 @@ def pastebin_version(pbclient: pastebin.PastebinClient = None) -> None:
 
     pbclient.paste(getpass.getuser(),
                    "qute version info {}".format(qutebrowser.__version__),
-                   version(),
+                   version_info(),
                    private=True)
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 903585b62..f1e0ee0b6 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -927,8 +927,8 @@ class VersionParams:
     VersionParams('no-autoconfig-loaded', autoconfig_loaded=False),
     VersionParams('no-config-py-loaded', config_py_loaded=False),
 ], ids=lambda param: param.name)
-def test_version_output(params, stubs, monkeypatch, config_stub):
-    """Test version.version()."""
+def test_version_info(params, stubs, monkeypatch, config_stub):
+    """Test version.version_info()."""
     config.instance.config_py_loaded = params.config_py_loaded
     import_path = os.path.abspath('/IMPORTPATH')
 
@@ -1048,7 +1048,7 @@ def test_version_output(params, stubs, monkeypatch, config_stub):
     """.lstrip('\n'))
 
     expected = template.rstrip('\n').format(**substitutions)
-    assert version.version() == expected
+    assert version.version_info() == expected
 
 
 class TestOpenGLInfo:
@@ -1133,7 +1133,7 @@ def pbclient(stubs):
 
 def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
     """Test version.pastebin_version() sets the url."""
-    monkeypatch.setattr('qutebrowser.utils.version.version',
+    monkeypatch.setattr('qutebrowser.utils.version.version_info',
                         lambda: "dummy")
     monkeypatch.setattr('qutebrowser.utils.utils.log_clipboard', True)
 
@@ -1148,7 +1148,7 @@ def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
 
 def test_pastebin_version_twice(pbclient, monkeypatch):
     """Test whether calling pastebin_version twice sends no data."""
-    monkeypatch.setattr('qutebrowser.utils.version.version',
+    monkeypatch.setattr('qutebrowser.utils.version.version_info',
                         lambda: "dummy")
 
     version.pastebin_version(pbclient)
@@ -1166,7 +1166,7 @@ def test_pastebin_version_twice(pbclient, monkeypatch):
 
 def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch):
     """Test version.pastebin_version() with errors."""
-    monkeypatch.setattr('qutebrowser.utils.version.version',
+    monkeypatch.setattr('qutebrowser.utils.version.version_info',
                         lambda: "dummy")
 
     version.pastebin_url = None