/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: Andrew Bennetts
  • Date: 2008-10-27 06:14:45 UTC
  • mfrom: (3793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3795.
  • Revision ID: andrew.bennetts@canonical.com-20081027061445-eqt9lz6uw1mbvq4g
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/configobj/configobj.py
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:
250
254
    This is the base class for all errors that ConfigObj raises.
251
255
    It is a subclass of SyntaxError.
252
256
    """
253
 
    def __init__(self, message='', line_number=None, line=''):
 
257
    def __init__(self, msg='', line_number=None, line=''):
254
258
        self.line = line
255
259
        self.line_number = line_number
256
 
        self.message = message
257
 
        SyntaxError.__init__(self, message)
 
260
        self.msg = msg
 
261
        SyntaxError.__init__(self, msg)
258
262
 
259
263
 
260
264
class NestingError(ConfigObjError):