← Back to branch summary

~mwhudson/loggerhead/browse-tree

« back to all changes in this revision

Viewing changes to loggerhead/config.py

  • Committer: Matt Nordhoff
  • Date: 2009-10-17 06:19:40 UTC
  • mto: (329.2.2 trailing-whitespace)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20091017061940-w9tcvy0xs1irno3y
Some random PEP 8 and otehr stylistic changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/config.py
91
91
        global_config = config.GlobalConfig().get_user_option('http_'+option)
92
92
        cmd_config = getattr(self._options, option)
93
93
        if global_config is not None and (
94
 
                cmd_config is None or cmd_config is False):
 
94
            cmd_config is None or cmd_config is False):
95
95
            return global_config
96
96
        else:
97
97
            return cmd_config