Navigation Menu

Skip to content

Commit

Permalink
add drink.loads to complete drink.dumps
Browse files Browse the repository at this point in the history
  • Loading branch information
fdev31 committed Mar 27, 2012
1 parent 4d7b5ba commit ad8776e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drink/__init__.py
Expand Up @@ -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.

Expand Down Expand Up @@ -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 = []
Expand Down

0 comments on commit ad8776e

Please sign in to comment.