From ad8776e0d36ca3a72a4511fbaf0feb4fdb0f616f Mon Sep 17 00:00:00 2001 From: fab Date: Tue, 27 Mar 2012 23:48:24 +0200 Subject: [PATCH] add drink.loads to complete drink.dumps --- drink/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drink/__init__.py b/drink/__init__.py index 76b1772..9549a86 100644 --- a/drink/__init__.py +++ b/drink/__init__.py @@ -30,6 +30,10 @@ from drink.config import config, BASE_DIR import bottle from hashlib import sha1 +try: + from json import loads +except ImportError: + from simplejson import loads #: All kind of drink objects as a ``{"name": Page_class}`` mapping. @@ -749,10 +753,6 @@ def inp(txt): elif len(sys.argv) == 3 and sys.argv[1] == "import": fake_authentication() - try: - from json import loads - except ImportError: - from simplejson import loads base = sys.argv[2] c_map = {} all_objs = []