Rev 5373: (jameinel) Fix file open flags for python2.7 (Martin [gz]) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5373 [merge]
revision-id: pqm at pqm.ubuntu.com-20100807203122-emne66ssgwyu26o6
parent: pqm at pqm.ubuntu.com-20100807164209-65oitxejsx27if31
parent: gzlist at googlemail.com-20100805234924-hftl1rfcubsiju8u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2010-08-07 21:31:22 +0100
message:
  (jameinel) Fix file open flags for python2.7 (Martin [gz])
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-07-29 11:17:57 +0000
+++ b/bzrlib/builtins.py	2010-08-07 20:31:22 +0000
@@ -20,7 +20,6 @@
 
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
-import codecs
 import cStringIO
 import sys
 import time
@@ -3135,9 +3134,9 @@
         def get_message(commit_obj):
             """Callback to get commit message"""
             if file:
-                f = codecs.open(file, 'rt', osutils.get_user_encoding())
+                f = open(file)
                 try:
-                    my_message = f.read()
+                    my_message = f.read().decode(osutils.get_user_encoding())
                 finally:
                     f.close()
             elif message is not None: