Rev 1962: (jam) handle when python doesn't understand locale (bug #35392) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1962
revision-id: pqm at pqm.ubuntu.com-20060828151515-6b58331caa7f8d36
parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
parent: john at arbash-meinel.com-20060828150419-f5077aa755c10f88
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-08-28 16:15:15 +0100
message:
  (jam) handle when python doesn't understand locale (bug #35392)
added:
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060828150419-f5077aa755c10f88
    parent: john at arbash-meinel.com-20060825150831-cdb3c94619956de6
    parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: locale-35392
    timestamp: Mon 2006-08-28 10:04:19 -0500
    message:
      [merge] bzr.dev 1961
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825150831-cdb3c94619956de6
    parent: john at arbash-meinel.com-20060825150557-3b0a26c2e2e7225b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: locale-35392
    timestamp: Fri 2006-08-25 10:08:31 -0500
    message:
      NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825150557-3b0a26c2e2e7225b
    parent: john at arbash-meinel.com-20060825150152-006e591e9cfb120e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: locale-35392
    timestamp: Fri 2006-08-25 10:05:57 -0500
    message:
      Change error message text
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825150152-006e591e9cfb120e
    parent: john at arbash-meinel.com-20060824210353-872444d189c3827a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: locale-35392
    timestamp: Fri 2006-08-25 10:01:52 -0500
    message:
      Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060824210353-872444d189c3827a
    parent: pqm at pqm.ubuntu.com-20060824002222-09d7139ba6ad0e6c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: locale-35392
    timestamp: Thu 2006-08-24 16:03:53 -0500
    message:
      Fix bug #35392: Don't die if LANG isn't recognized by python