Merge pull request #395 from tindatnguyen/fix/werkzeug_imports

fix werkzeug imports error for client.py

flask_oauthlib/client.py

@@ -15,8 +15,9 @@
 from functools import wraps
 from oauthlib.common import to_unicode, PY3, add_params_to_uri
 from flask import request, redirect, json, session, current_app
-from werkzeug import url_quote, url_decode, url_encode
-from werkzeug import parse_options_header, cached_property
+from werkzeug.urls import url_quote, url_decode, url_encode
+from werkzeug.http import parse_options_header
+from werkzeug.utils import cached_property
 from .utils import to_bytes
 try:
     from urlparse import urljoin

flask_oauthlib/contrib/cache.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
-from werkzeug.contrib.cache import NullCache, SimpleCache, FileSystemCache
-from werkzeug.contrib.cache import MemcachedCache, RedisCache
+from cachelib import NullCache, SimpleCache, FileSystemCache
+from cachelib import MemcachedCache, RedisCache
 
 
 class Cache(object):

flask_oauthlib/provider/oauth1.py

@@ -10,7 +10,7 @@
 
 import logging
 from functools import wraps
-from werkzeug import cached_property
+from werkzeug.utils import cached_property
 from flask import request, redirect, url_for
 from flask import make_response, abort
 from oauthlib.oauth1 import RequestValidator

flask_oauthlib/provider/oauth2.py

@@ -14,8 +14,7 @@
 from functools import wraps
 from flask import request, url_for
 from flask import redirect, abort
-from werkzeug import cached_property
-from werkzeug.utils import import_string
+from werkzeug.utils import import_string, cached_property
 from oauthlib import oauth2
 from oauthlib.oauth2 import RequestValidator, Server
 from oauthlib.common import to_unicode, add_params_to_uri

requirements.txt

@@ -3,3 +3,4 @@ mock==2.0.0
 oauthlib==2.0.6
 requests-oauthlib==0.8.0
 Flask-SQLAlchemy==2.1
+cachelib==0.1.1

setup.py

@@ -45,6 +45,7 @@ def fread(filename):
         'Flask',
         'oauthlib>=1.1.2,!=2.0.3,!=2.0.4,!=2.0.5,<3.0.0',
         'requests-oauthlib>=0.6.2,<1.2.0',
+        'cachelib',
     ],
     tests_require=['nose', 'Flask-SQLAlchemy', 'mock'],
     test_suite='nose.collector',