Add initial support for the typing module

qutebrowser/utils/typing.py

@@ -0,0 +1,37 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Wrapper for Python 3.5's typing module.
+
+This wrapper is needed as both Python 3.5 and typing for PyPI isn't commonly
+packaged yet. As we don't actually need anything from the typing module at
+runtime, we instead mock the typing classes (using objects to make things
+easier) so the typing module isn't a hard dependency.
+"""
+
+try:
+    from typing import Union
+except ImportError:
+
+    class TypingFake:
+
+        def __getitem__(self, _item):
+            pass
+
+    Union = TypingFake()

qutebrowser/utils/version.py

@@ -135,6 +135,7 @@ def _module_versions():
         ('pygments', ['__version__']),
         ('yaml', ['__version__']),
         ('cssutils', ['__version__']),
+        ('typing', []),
     ])
     for name, attributes in modules.items():
         try:

tests/unit/utils/test_version.py

@@ -325,6 +325,7 @@ class ImportFake:
             'pygments': True,
             'yaml': True,
             'cssutils': True,
+            'typing': True,
         }
         self.version_attribute = '__version__'
         self.version = '1.2.3'
@@ -384,12 +385,13 @@ class TestModuleVersions:
         """Test with all modules present in version 1.2.3."""
         expected = ['sip: yes', 'colorama: 1.2.3', 'pypeg2: 1.2.3',
                     'jinja2: 1.2.3', 'pygments: 1.2.3', 'yaml: 1.2.3',
-                    'cssutils: 1.2.3']
+                    'cssutils: 1.2.3', 'typing: yes']
         assert version._module_versions() == expected
 
     @pytest.mark.parametrize('module, idx, expected', [
         ('colorama', 1, 'colorama: no'),
         ('cssutils', 6, 'cssutils: no'),
+        ('typing', 7, 'typing: no'),
     ])
     def test_missing_module(self, module, idx, expected, import_fake):
         """Test with a module missing.
@@ -405,12 +407,12 @@ class TestModuleVersions:
     @pytest.mark.parametrize('value, expected', [
         ('VERSION', ['sip: yes', 'colorama: 1.2.3', 'pypeg2: yes',
                      'jinja2: yes', 'pygments: yes', 'yaml: yes',
-                     'cssutils: yes']),
+                     'cssutils: yes', 'typing: yes']),
         ('SIP_VERSION_STR', ['sip: 1.2.3', 'colorama: yes', 'pypeg2: yes',
                              'jinja2: yes', 'pygments: yes', 'yaml: yes',
-                             'cssutils: yes']),
+                             'cssutils: yes', 'typing: yes']),
         (None, ['sip: yes', 'colorama: yes', 'pypeg2: yes', 'jinja2: yes',
-                'pygments: yes', 'yaml: yes', 'cssutils: yes']),
+                'pygments: yes', 'yaml: yes', 'cssutils: yes', 'typing: yes']),
     ])
     def test_version_attribute(self, value, expected, import_fake):
         """Test with a different version attribute.