diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 51622ce7..e64224d2 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -7,7 +7,7 @@ from __future__ import print_function import re import urllib from pydal._compat import maketrans, urllib_quote, unicodeT, to_bytes, to_native, xrange -from pydal.utils import local_html_escape as escape +from gluon.utils import local_html_escape as escape from ast import parse as ast_parse import ast diff --git a/gluon/highlight.py b/gluon/highlight.py index 97b77990..bf98e9b3 100644 --- a/gluon/highlight.py +++ b/gluon/highlight.py @@ -8,7 +8,7 @@ """ from __future__ import print_function from pydal._compat import xrange -from pydal.utils import local_html_escape +from gluon.utils import local_html_escape import re __all__ = ['highlight'] diff --git a/gluon/html.py b/gluon/html.py index bd693406..049ede93 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -21,7 +21,7 @@ import base64 from gluon import sanitizer, decoder import itertools from pydal._compat import reduce, pickle, copyreg, HTMLParser, name2codepoint, iteritems, unichr, unicodeT, urllib_quote, to_bytes, to_native, to_unicode, basestring, urlencode, implements_bool -from pydal.utils import local_html_escape +from gluon.utils import local_html_escape import marshal from gluon.storage import Storage diff --git a/gluon/languages.py b/gluon/languages.py index 88e659a6..528a9ceb 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -19,7 +19,7 @@ import logging from cgi import escape from threading import RLock from gluon.utf8 import Utf8 -from pydal.utils import local_html_escape +from gluon.utils import local_html_escape from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin from pydal.contrib.portalocker import read_locked, LockedFile