← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/auth/fakeldap.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/auth/fakeldap.py
24
24
"""
25
25
 
26
26
import fnmatch
27
 
import json
 
27
 
 
28
from nova.openstack.common import jsonutils
28
29
 
29
30
 
30
31
class Store(object):
191
192
    Returns a list of strings
192
193
 
193
194
    """
194
 
    return [str(x) for x in json.loads(encoded)]
 
195
    return [str(x) for x in jsonutils.loads(encoded)]
195
196
 
196
197
 
197
198
def _to_json(unencoded):
204
205
    Returns a json string
205
206
 
206
207
    """
207
 
    return json.dumps(list(unencoded))
 
208
    return jsonutils.dumps(list(unencoded))
208
209
 
209
210
 
210
211
server_fail = False