always import from ._compat

Author: ThomasWaldmann

flask/app.py

@@ -34,7 +34,7 @@
     _default_template_ctx_processor
 from .signals import request_started, request_finished, got_request_exception, \
     request_tearing_down, appcontext_tearing_down
-from flask._compat import reraise, string_types, integer_types
+from ._compat import reraise, string_types, integer_types
 
 # a lock used for logger initialization
 _logger_lock = Lock()

flask/config.py

@@ -14,7 +14,7 @@
 import errno
 
 from werkzeug.utils import import_string
-from flask._compat import string_types
+from ._compat import string_types
 
 
 class ConfigAttribute(object):

flask/debughelpers.py

@@ -8,7 +8,7 @@
     :copyright: (c) 2011 by Armin Ronacher.
     :license: BSD, see LICENSE for more details.
 """
-from flask._compat import implements_to_string
+from ._compat import implements_to_string
 
 
 class UnexpectedUnicodeError(AssertionError, UnicodeError):

flask/exthook.py

@@ -21,7 +21,7 @@
 """
 import sys
 import os
-from flask._compat import reraise
+from ._compat import reraise
 
 
 class ExtensionImporter(object):

flask/helpers.py

@@ -24,7 +24,6 @@
 
 from werkzeug.datastructures import Headers
 from werkzeug.exceptions import NotFound
-from flask._compat import string_types, text_type
 
 # this was moved in 0.7
 try:
@@ -37,6 +36,7 @@
 from .signals import message_flashed
 from .globals import session, _request_ctx_stack, _app_ctx_stack, \
      current_app, request
+from ._compat import string_types, text_type
 
 
 # sentinel

flask/testing.py

@@ -13,7 +13,7 @@
 from contextlib import contextmanager
 from werkzeug.test import Client, EnvironBuilder
 from flask import _request_ctx_stack
-from flask._compat import urlparse
+from ._compat import urlparse
 
 
 def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs):