Rev 5521: (gz) Use ConfigObj encoding parameter rather than indirecting through in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5521 [merge]
revision-id: pqm at pqm.ubuntu.com-20101102235146-sw9vxf9n28nc1cuj
parent: pqm at pqm.ubuntu.com-20101102231704-tp1zv8m5659w19gn
parent: maxb at f2s.com-20101031143117-57vrfu630yq8a3k2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-11-02 23:51:46 +0000
message:
  (gz) Use ConfigObj encoding parameter rather than indirecting through
   options dict (Max Bowsher)
modified:
  bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
=== modified file 'bzrlib/rules.py'
--- a/bzrlib/rules.py	2010-02-02 06:30:43 +0000
+++ b/bzrlib/rules.py	2010-10-31 14:31:17 +0000
@@ -74,8 +74,7 @@
 
         :param inifile: the name of the file or a sequence of lines.
         """
-        options = {'encoding': 'utf-8'}
-        self._cfg = configobj.ConfigObj(inifile, options=options)
+        self._cfg = configobj.ConfigObj(inifile, encoding='utf-8')
         sections = self._cfg.keys()
         patterns = []
         self.pattern_to_section = {}