/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/load_test.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-02 15:20:49 UTC
  • mfrom: (429.1.1 trunk)
  • Revision ID: jelmer@samba.org-20110302152049-09hvrpnox41sr1au
Merge optional (broken) support for "json" module as alternative for "simplejson".

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/load_test.py
67
67
import time
68
68
import Queue
69
69
 
70
 
try:
71
 
    import simplejson
72
 
except ImportError:
73
 
    import json as simplejson
 
70
import simplejson
74
71
 
75
72
from bzrlib import (
76
73
    errors,