Rev 6099: Remove useless check. in file:///home/vila/src/bzr/experimental/expand-in-stack/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/expand-in-stack/

------------------------------------------------------------
revno: 6099
revision-id: v.ladeuil+lp at free.fr-20110906105055-lcomuvwi01hsnyru
parent: v.ladeuil+lp at free.fr-20110906091036-0u5il0t26eymtby3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: expand-in-stack
timestamp: Tue 2011-09-06 12:50:55 +0200
message:
  Remove useless check.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-09-06 09:10:36 +0000
+++ b/bzrlib/config.py	2011-09-06 10:50:55 +0000
@@ -3063,7 +3063,7 @@
                         trace.warning('Cannot expand "%s":'
                                       ' %s does not support option expansion'
                                       % (name, type(val)))
-                if opt is not None and val is not None:
+                if opt is not None:
                     val = opt.convert_from_unicode(val)
             return val
         value = expand_and_convert(value)