From 5adf48ed3deaf8066551fd6294c5c041832b07aa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 26 Aug 2014 20:33:41 +0200
Subject: [PATCH] Rename utils.url to utils.urlutils.

---
 doc/HACKING.asciidoc                      | 5 +++--
 qutebrowser/app.py                        | 3 +--
 qutebrowser/browser/commands.py           | 4 ++--
 qutebrowser/test/utils/test_url.py        | 6 +++---
 qutebrowser/utils/{url.py => urlutils.py} | 0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename qutebrowser/utils/{url.py => urlutils.py} (100%)

diff --git a/doc/HACKING.asciidoc b/doc/HACKING.asciidoc
index b4c4d221b..2c4974115 100644
--- a/doc/HACKING.asciidoc
+++ b/doc/HACKING.asciidoc
@@ -347,8 +347,9 @@ following guidelines:
 
 * Convert a string to a QUrl object as early as possible, i.e. directly after
 the user did enter it.
-    - Use `utils.url.fuzzy_url` if the URL is entered by the user somewhere.
-    - Be sure you handle `utils.url.FuzzyError` and display an error
+    - Use `utils.urlutils.fuzzy_url` if the URL is entered by the user
+      somewhere.
+    - Be sure you handle `utils.urlutils.FuzzyError` and display an error
       message to the user.
 * Convert a `QUrl` object to a string as late as possible, e.g. before
 displaying it to the user.
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 817fcf2fb..33497d449 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -44,8 +44,7 @@ from qutebrowser.browser import quickmarks, cookies, downloads
 from qutebrowser.widgets import mainwindow, console, crash
 from qutebrowser.keyinput import modeparsers, keyparser, modeman
 from qutebrowser.utils import (log, version, message, utilcmds, readline,
-                               utils, qtutils)
-from qutebrowser.utils import url as urlutils
+                               utils, qtutils, urlutils)
 from qutebrowser.utils import usertypes as utypes
 
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 551e40a40..4b906e933 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -34,8 +34,8 @@ from qutebrowser.commands import utils as cmdutils
 from qutebrowser.commands import exceptions as cmdexc
 from qutebrowser.config import config
 from qutebrowser.browser import hints, quickmarks
-from qutebrowser.utils import message, webelem, editor, usertypes, log, qtutils
-from qutebrowser.utils import url as urlutils
+from qutebrowser.utils import (message, webelem, editor, usertypes, log,
+                               qtutils, urlutils)
 
 
 class CommandDispatcher:
diff --git a/qutebrowser/test/utils/test_url.py b/qutebrowser/test/utils/test_url.py
index 8f366d8b7..c9c05e761 100644
--- a/qutebrowser/test/utils/test_url.py
+++ b/qutebrowser/test/utils/test_url.py
@@ -19,13 +19,13 @@
 
 # pylint: disable=protected-access
 
-"""Tests for qutebrowser.utils.url."""
+"""Tests for qutebrowser.utils.urlutils."""
 
 import unittest
 
 from PyQt5.QtCore import QUrl
 
-from qutebrowser.utils import url as urlutils
+from qutebrowser.utils import urlutils
 from qutebrowser.test import stubs
 
 
@@ -112,7 +112,7 @@ class SearchUrlTests(unittest.TestCase):
         urlutils.config = self.config
 
 
-@unittest.mock.patch('qutebrowser.utils.url.config.get', autospec=True)
+@unittest.mock.patch('qutebrowser.utils.urlutils.config.get', autospec=True)
 class IsUrlTests(unittest.TestCase):
 
     """Tests for is_url.
diff --git a/qutebrowser/utils/url.py b/qutebrowser/utils/urlutils.py
similarity index 100%
rename from qutebrowser/utils/url.py
rename to qutebrowser/utils/urlutils.py