Commit f58bc069 authored by Bob Ippolito's avatar Bob Ippolito

import StringIO at module level

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4040996
parent a188a950
...@@ -18,6 +18,10 @@ import sys ...@@ -18,6 +18,10 @@ import sys
import os import os
import time import time
import zipimport import zipimport
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
__all__ = [ __all__ = [
'register_loader_type', 'get_provider', 'IResourceProvider', 'register_loader_type', 'get_provider', 'IResourceProvider',
...@@ -312,7 +316,6 @@ class ZipProvider(DefaultProvider): ...@@ -312,7 +316,6 @@ class ZipProvider(DefaultProvider):
return self.loader.get_data(path) return self.loader.get_data(path)
def get_resource_stream(self, manager, resource_name): def get_resource_stream(self, manager, resource_name):
from cStringIO import StringIO
return StringIO(self.get_resource_string(manager, resource_name)) return StringIO(self.get_resource_string(manager, resource_name))
def _extract_resource(self, manager, resource_name): def _extract_resource(self, manager, resource_name):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment