Rev 4424: (mbp) Remove users of bzrlib.user_encoding in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4424
revision-id: pqm at pqm.ubuntu.com-20090610030324-iuwo21bbtvf72wux
parent: pqm at pqm.ubuntu.com-20090610010249-5iyq9oics6tysru4
parent: mbp at sourcefrog.net-20090610014408-lkymwbuipelhd6rh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-06-10 04:03:24 +0100
message:
  (mbp) Remove users of bzrlib.user_encoding
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 4423.1.1
    revision-id: mbp at sourcefrog.net-20090610014408-lkymwbuipelhd6rh
    parent: pqm at pqm.ubuntu.com-20090610010249-5iyq9oics6tysru4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Wed 2009-06-10 11:44:08 +1000
    message:
      Remove users of bzrlib.user_encoding
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
=== modified file 'NEWS'
--- a/NEWS	2009-06-09 14:19:23 +0000
+++ b/NEWS	2009-06-10 01:44:08 +0000
@@ -117,6 +117,9 @@
   ``graph._StackedParentsProvider``. The api is now considered stable and ready
   for external users. (Gary van der Merwe)
 
+* ``bzrlib.user_encoding`` is deprecated in favor of
+  ``get_user_encoding``.  (Alexander Belchenko)
+
 * TreeTransformBase no longer assumes that limbo is provided via disk.
   DiskTreeTransform now provides disk functionality.  (Aaron Bentley)
 

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2009-06-05 09:13:02 +0000
+++ b/bzrlib/osutils.py	2009-06-10 01:44:08 +0000
@@ -722,7 +722,7 @@
                _format_date(t, offset, timezone, date_fmt, show_offset)
     date_str = time.strftime(date_fmt, tt)
     if not isinstance(date_str, unicode):
-        date_str = date_str.decode(bzrlib.user_encoding, 'replace')
+        date_str = date_str.decode(get_user_encoding(), 'replace')
     return date_str + offset_str
 
 def _format_date(t, offset, timezone, date_fmt, show_offset):

=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2009-06-10 01:44:08 +0000
@@ -656,7 +656,7 @@
         self.stdout = sys.stdout
 
     def tearDown(self):
-        bzrlib.user_encoding = self.user_encoding
+        osutils._cached_user_encoding = self.user_encoding
         sys.stdout = self.stdout
         TestCaseWithTransport.tearDown(self)
 

=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2009-05-23 04:55:52 +0000
+++ b/bzrlib/win32utils.py	2009-06-10 01:44:08 +0000
@@ -267,7 +267,7 @@
 
     Returned value can be unicode or plain string.
     To convert plain string to unicode use
-    s.decode(bzrlib.user_encoding)
+    s.decode(osutils.get_user_encoding())
     (XXX - but see bug 262874, which asserts the correct encoding is 'mbcs')
     """
     local = _get_sh_special_folder_path(CSIDL_LOCAL_APPDATA)