[FIX] *: deprecated access to url_ utilities through werkzeug root

In 0.15 accessing werkzeug.urls functions directly through werkzeug
is deprecated, the shortcut will be removed in the eventual werkzeug
1.0.

Fix existing uses of these shortcuts. Also cleanup some imports when
they're not far from a werkzeug* import being altered.

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 687f49e919b..83c0df51ff8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -7,6 +7,7 @@ import os
 import logging
 import pytz
 import requests
+import werkzeug.urls
 import werkzeug.utils
 import werkzeug.wrappers
 
@@ -51,9 +52,9 @@ class QueryURL(object):
                     paths[key] = u"%s" % value
             elif value:
                 if isinstance(value, list) or isinstance(value, set):
-                    fragments.append(werkzeug.url_encode([(key, item) for item in value]))
+                    fragments.append(werkzeug.urls.url_encode([(key, item) for item in value]))
                 else:
-                    fragments.append(werkzeug.url_encode([(key, value)]))
+                    fragments.append(werkzeug.urls.url_encode([(key, value)]))
         for key in path_args:
             value = paths.get(key)
             if value is not None: