/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/util/configobj/configobj.py

  • Committer: Vincent Ladeuil
  • Date: 2008-10-02 06:18:42 UTC
  • mfrom: (3757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3759.
  • Revision ID: v.ladeuil+lp@free.fr-20081002061842-4ctag1pkr7ua9gu2
Fix conflict. Related to moved lines, nice use case

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
 
26
26
import os, re
27
27
compiler = None
28
 
try:
29
 
    import compiler
30
 
except ImportError:
31
 
    # for IronPython
32
 
    pass
 
28
# Bzr modification: Disabled import of 'compiler' module
 
29
# bzr doesn't use the 'unrepr' feature of configobj, so importing compiler just
 
30
# wastes several milliseconds on every single bzr invocation.
 
31
#   -- Andrew Bennetts, 2008-10-14
 
32
#try:
 
33
#    import compiler
 
34
#except ImportError:
 
35
#    # for IronPython
 
36
#    pass
33
37
from types import StringTypes
34
38
from warnings import warn
35
39
try: