Rev 4184: (vila) Fix python2.6 obsoleted import in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4184
revision-id: pqm at pqm.ubuntu.com-20090323113212-g753gcfm1e3u3n0k
parent: pqm at pqm.ubuntu.com-20090323043327-txb4jri5i3gssuj5
parent: v.ladeuil+lp at free.fr-20090323104010-42q3hsidiksm5q7u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-03-23 11:32:12 +0000
message:
  (vila) Fix python2.6 obsoleted import
modified:
  bzrlib/filters/__init__.py     __init__.py-20080416080515-mkxl29amuwrf6uir-2
    ------------------------------------------------------------
    revno: 4183.2.1
    revision-id: v.ladeuil+lp at free.fr-20090323104010-42q3hsidiksm5q7u
    parent: pqm at pqm.ubuntu.com-20090323043327-txb4jri5i3gssuj5
    parent: v.ladeuil+lp at free.fr-20090323093443-08hur53lvlots8ie
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: integration
    timestamp: Mon 2009-03-23 11:40:10 +0100
    message:
      Fix python2.6 obsoleted import
    modified:
      bzrlib/filters/__init__.py     __init__.py-20080416080515-mkxl29amuwrf6uir-2
    ------------------------------------------------------------
    revno: 4183.1.1
    revision-id: v.ladeuil+lp at free.fr-20090323093443-08hur53lvlots8ie
    parent: pqm at pqm.ubuntu.com-20090323043327-txb4jri5i3gssuj5
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 345593-wrong-import
    timestamp: Mon 2009-03-23 10:34:43 +0100
    message:
      Fix python2.6 obsoleted import.
    modified:
      bzrlib/filters/__init__.py     __init__.py-20080416080515-mkxl29amuwrf6uir-2
=== modified file 'bzrlib/filters/__init__.py'
--- a/bzrlib/filters/__init__.py	2009-02-25 07:01:31 +0000
+++ b/bzrlib/filters/__init__.py	2009-03-23 09:34:43 +0000
@@ -40,7 +40,7 @@
 """
 
 
-import cStringIO, sha
+from cStringIO import StringIO
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
 from bzrlib import (
@@ -150,7 +150,7 @@
         for filter in filters:
             if filter.reader is not None:
                 chunks = filter.reader(chunks)
-        return cStringIO.StringIO(''.join(chunks))
+        return StringIO(''.join(chunks))
     else:
         return f