~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rules.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
64
64
        """
65
65
        raise NotImplementedError(self.get_selected_items)
66
66
 
 
67
    def get_single_value(self, path, preference_name):
 
68
        """Get a single preference for a single file.
 
69
        
 
70
        :returns: The string preference value, or None.
 
71
        """
 
72
        for key, value in self.get_selected_items(path, [preference_name]):
 
73
            return value
 
74
        return None
 
75
 
67
76
 
68
77
class _IniBasedRulesSearcher(_RulesSearcher):
69
78
 
74
83
 
75
84
        :param inifile: the name of the file or a sequence of lines.
76
85
        """
77
 
        options = {'encoding': 'utf-8'}
78
 
        self._cfg = configobj.ConfigObj(inifile, options=options)
 
86
        self._cfg = configobj.ConfigObj(inifile, encoding='utf-8')
79
87
        sections = self._cfg.keys()
80
88
        patterns = []
81
89
        self.pattern_to_section = {}