From fb357eb241e9f3b668143ae2bf3f6ee642c05d66 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 19 Oct 2012 18:36:39 -0500 Subject: [PATCH] fixed problem with new importer and custom import --- VERSION | 2 +- gluon/tools.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 98865e61..34fbedde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-19 14:59:27) dev +Version 2.1.1 (2012-10-19 18:36:33) dev diff --git a/gluon/tools.py b/gluon/tools.py index a323a3ff..3b20d71d 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -25,25 +25,28 @@ import Cookie import cStringIO from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string -from contenttype import contenttype -from storage import Storage, StorageList, Settings, Messages -from utils import web2py_uuid -from fileutils import read_file, check_credentials +from gluon.contenttype import contenttype +from gluon.storage import Storage, StorageList, Settings, Messages +from gluon.utils import web2py_uuid +from gluon.fileutils import read_file, check_credentials from gluon import * from gluon.contrib.autolinks import expand_one from gluon.contrib.markmin.markmin2html import \ replace_at_urls, replace_autolinks, replace_components from gluon.dal import Row -import serializers +import gluon.serializers as serializers try: - import json as json_parser # try stdlib (Python 2.6) + # try stdlib (Python 2.6) + import json as json_parser except ImportError: try: - import simplejson as json_parser # try external module + # try external module + import simplejson as json_parser except: - import contrib.simplejson as json_parser # fallback to pure-Python module + # fallback to pure-Python module + import contrib.simplejson as json_parser __all__ = ['Mail', 'Auth', 'Recaptcha', 'Crud', 'Service', 'Wiki', 'PluginManager', 'fetch', 'geocode', 'prettydate']