Rename config.conftypes to config.configtypes.

qutebrowser/app.py

@@ -37,7 +37,7 @@ from PyQt5.QtCore import (pyqtSlot, QTimer, QEventLoop, Qt, QStandardPaths,
 import qutebrowser
 from qutebrowser.commands import userscripts, runners, cmdutils
 from qutebrowser.config import (style, config, websettings, iniparsers,
-                                lineparser, conftypes)
+                                lineparser, configtypes)
 from qutebrowser.network import qutescheme, proxy
 from qutebrowser.browser import quickmarks, cookies, downloads
 from qutebrowser.widgets import mainwindow, console, crash
@@ -170,7 +170,7 @@ class Application(QApplication):
         try:
             self.config = config.ConfigManager(confdir, 'qutebrowser.conf',
                                                self)
-        except (conftypes.ValidationError,
+        except (configtypes.ValidationError,
                 config.NoOptionError,
                 config.InterpolationSyntaxError,
                 configparser.InterpolationError,

qutebrowser/config/config.py

@@ -33,7 +33,7 @@ import collections.abc
 from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication
 
 from qutebrowser.utils import log
-from qutebrowser.config import configdata, iniparsers, conftypes
+from qutebrowser.config import configdata, iniparsers, configtypes
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import message
 from qutebrowser.utils.usertypes import Completion
@@ -223,7 +223,7 @@ class ConfigManager(QObject):
                 k = k.replace('<eq>', '=')
                 try:
                     self.set('conf', sectname, k, v)
-                except conftypes.ValidationError as e:
+                except configtypes.ValidationError as e:
                     e.section = sectname
                     e.option = k
                     raise
@@ -347,7 +347,7 @@ class ConfigManager(QObject):
         """
         try:
             self.set('conf', sectname, optname, value)
-        except (NoOptionError, NoSectionError, conftypes.ValidationError,
+        except (NoOptionError, NoSectionError, configtypes.ValidationError,
                 ValueError) as e:
             raise cmdexc.CommandError("set: {} - {}".format(
                 e.__class__.__name__, e))
@@ -369,7 +369,8 @@ class ConfigManager(QObject):
         """
         try:
             self.set('temp', sectname, optname, value)
-        except (NoOptionError, NoSectionError, conftypes.ValidationError) as e:
+        except (NoOptionError, NoSectionError,
+                configtypes.ValidationError) as e:
             raise cmdexc.CommandError("set: {} - {}".format(
                 e.__class__.__name__, e))
 

qutebrowser/config/configdata.py

@@ -29,7 +29,7 @@ DATA: The config defaults, an OrderedDict of sections.
 import re
 import collections
 
-from qutebrowser.config import conftypes as typ
+from qutebrowser.config import configtypes as typ
 from qutebrowser.config import sections as sect
 from qutebrowser.config.value import SettingValue
 from qutebrowser.utils.qtutils import MAXVALS

qutebrowser/network/proxy.py

@@ -22,7 +22,7 @@
 
 from PyQt5.QtNetwork import QNetworkProxyFactory
 
-from qutebrowser.config import config, conftypes
+from qutebrowser.config import config, configtypes
 
 
 def init():
@@ -44,7 +44,7 @@ class ProxyFactory(QNetworkProxyFactory):
             A list of QNetworkProxy objects in order of preference.
         """
         proxy = config.get('network', 'proxy')
-        if proxy is conftypes.SYSTEM_PROXY:
+        if proxy is configtypes.SYSTEM_PROXY:
             return QNetworkProxyFactory.systemProxyForQuery(query)
         else:
             return [proxy]