Merge lp:~jelmer/bzr-builddeb/712177-configobj into lp:bzr-builddeb

[Jelmer Vernooij]

Fix import of ParseError when both bzr and the system have a (different) configobj copy.

[Vincent Ladeuil (vila)]

Weird, where did you encounter the problem ?

review: Approve

[Jelmer Vernooij (jelmer)]

On Thu, 2011-02-03 at 15:17 +0000, Vincent Ladeuil wrote:
> Review: Approve
> Weird, where did you encounter the problem ?
This happens with the packaged version of bzr, which uses configobj
itself but in some situations also still has bzrlib.util.configobj
present.

Cheers,

Jelmer

=== modified file 'config.py'
--- config.py	2011-01-24 06:23:40 +0000
+++ config.py	2011-02-03 10:28:01 +0000
@@ -18,12 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from bzrlib.config import ConfigObj, TreeConfig
+from bzrlib.config import (
+  configobj,
+  ConfigObj,
+  TreeConfig,
+  )
 from bzrlib.trace import mutter, warning
-try:
-  from bzrlib.util.configobj.configobj import ParseError
-except ImportError:
-  from configobj import ParseError
 
 
 BUILD_TYPE_NORMAL = "normal"
@@ -100,7 +100,7 @@
     for input in files:
       try:
         config = ConfigObj(input[0])
-      except ParseError, e:
+      except configobj.ParseError, e:
         if len(input) > 2:
           content = input[2]
         else: