Moved openSource function into utils file so it can be used elsewhere if needed

lantis63 · lantis63 · commit a1a2ab4c7791 · 2006-12-07T22:40:48.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%4085
diff --git a/inputstream.py b/inputstream.py
@@ -1,30 +1,6 @@
 import codecs
 
-def openSource(source):
-    """ Opens source first trying to open a local file, if that fails 
-    try to open as a URL and finally treating source as a string.
-    
-    Returns a file-like object.
-    """
-    # Already a file-like object?
-    if hasattr(source, 'tell'):
-        return source
-
-    # Try opening source normally
-    try:
-        return open(source)
-    except: pass
-
-    # Try opening source as a URL and storing the bytes returned so
-    # they can be turned into a file-like object below
-    try:
-        import urllib
-        source = urllib.urlopen(source).read(-1)
-    except: pass
-
-    # Treat source as a string and make it into a file-like object
-    import cStringIO as StringIO
-    return StringIO.StringIO(str(source))
+from utils.utils import openSource
 
 class HTMLInputStream(object):
     """For reading data from an input stream
diff --git a/utils/utils.py b/utils/utils.py
@@ -33,3 +33,29 @@ def __getitem__(self, key):
                 return self.defaultValue
             else:
                 raise
+
+def openSource(source):
+    """ Opens source first trying to open a local file, if that fails 
+    try to open as a URL and finally treating source as a string.
+
+    Returns a file-like object.
+    """
+    # Already a file-like object?
+    if hasattr(source, 'tell'):
+        return source
+
+    # Try opening source normally
+    try:
+        return open(source)
+    except: pass
+
+    # Try opening source as a URL and storing the bytes returned so
+    # they can be turned into a file-like object below
+    try:
+        import urllib
+        source = urllib.urlopen(source).read(-1)
+    except: pass
+
+    # Treat source as a string and make it into a file-like object
+    import cStringIO as StringIO
+    return StringIO.StringIO(str(source))
