← Back to branch summary

~brad-fie/bzr-scmproj/bzr-scmproj-subprojectnames-01

« back to all changes in this revision

Viewing changes to config.py

  • Committer: Brad Friedman
  • Date: 2012-03-06 03:21:55 UTC
  • mfrom: (381.2.2 trunk)
  • Revision ID: brad@fie.us-20120306032155-m2l0566nnjni7bti
merging in upstream changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.py
11
11
    )
12
12
import bzrlib.config
13
13
from bzrlib.lazy_regex import lazy_compile
14
 
from bzrlib.util.configobj import configobj
 
14
# configobj library
 
15
try:
 
16
    from bzrlib.util.configobj import configobj
 
17
except ImportError:
 
18
    import configobj
15
19
 
16
20
from bzrlib.plugins.scmproj.pythonutils import odict
17
21