← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/config.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-12 13:25:20 UTC
  • mfrom: (426.1.1 configobj)
  • Revision ID: jelmer@samba.org-20110212132520-nt6rwhmzvybtxwz4
Merge support for bzrlib instances without bzrlib.util.configobj.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/config.py
10
10
 
11
11
import bzrlib.lru_cache
12
12
 
13
 
from bzrlib.util.configobj.configobj import ConfigObj
 
13
try:
 
14
    from bzrlib.util.configobj.configobj import ConfigObj
 
15
except ImportError:
 
16
    from configobj import ConfigObj
14
17
 
15
18
from paste.request import path_info_pop
16
19
from paste import httpexceptions