Rev 3239: Convert hasattr to getatter in ConfigObj (mnordhoff) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3239
revision-id:pqm at pqm.ubuntu.com-20080227195331-0nc0vzgjka1ornoe
parent: pqm at pqm.ubuntu.com-20080227181337-obp6vadq9d34z220
parent: mnordhoff at mattnordhoff.com-20080227071226-q8rwfacp8oez2xu4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-27 19:53:31 +0000
message:
  Convert hasattr to getatter in ConfigObj (mnordhoff)
modified:
  bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
    ------------------------------------------------------------
    revno: 3221.7.7.1.1
    revision-id:mnordhoff at mattnordhoff.com-20080227071226-q8rwfacp8oez2xu4
    parent: mnordhoff at mattnordhoff.com-20080219185424-skmms84cwj5abvqi
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: configobj-4.5.1
    timestamp: Wed 2008-02-27 07:12:26 +0000
    message:
      Use getattr instead of hasattr everywhere else in the file...
    modified:
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
=== modified file 'bzrlib/util/configobj/configobj.py'
--- a/bzrlib/util/configobj/configobj.py	2008-02-19 18:54:24 +0000
+++ b/bzrlib/util/configobj/configobj.py	2008-02-27 07:12:26 +0000
@@ -1956,7 +1956,7 @@
                 # FIXME: can we supply any useful information here ?
                 raise RepeatSectionError()
             
-        if hasattr(configspec, 'initial_comment'):
+        if getattr(configspec, 'initial_comment', None) is not None:
             section._configspec_initial_comment = configspec.initial_comment
             section._configspec_final_comment = configspec.final_comment
             section._configspec_encoding = configspec.encoding
@@ -2201,7 +2201,7 @@
             section = self
         #
         spec_section = section.configspec
-        if copy and hasattr(section, '_configspec_initial_comment'):
+        if copy and getattr(section, '_configspec_initial_comment', None) is not None:
             section.initial_comment = section._configspec_initial_comment
             section.final_comment = section._configspec_final_comment
             section.encoding = section._configspec_encoding
@@ -2262,7 +2262,7 @@
                     except KeyError:
                         pass
                     
-                if hasattr(validator, 'get_default_value'):
+                if getattr(validator, 'get_default_value', None) is not None:
                     try: 
                         section.default_values[entry] = validator.get_default_value(spec_section[entry])
                     except KeyError: