diff gamelib/data.py @ 303:e12d99215b74

Fix up data module unix-to-local path fixing. Fix similar problems in tile importing.
author Simon Cross <hodgestar@gmail.com>
date Sat, 05 Sep 2009 17:35:17 +0000
parents c0455e6c99f4
children
line wrap: on
line diff
--- a/gamelib/data.py	Sat Sep 05 17:18:14 2009 +0000
+++ b/gamelib/data.py	Sat Sep 05 17:35:17 2009 +0000
@@ -10,10 +10,15 @@
 data_py = os.path.abspath(os.path.dirname(__file__))
 data_dir = os.path.normpath(os.path.join(data_py, '..', 'data'))
 
+def unix_to_local(filename):
+    '''Convert a relative unix / http filename to a local one.'''
+    return os.path.join(*filename.split("/"))
+
 def filepath(*filenames):
     '''Determine the path to a file in the data directory.
     '''
-    return os.path.join(data_dir, *filenames)
+    os_filenames = [unix_to_local(f) for f in filenames]
+    return os.path.join(data_dir, *os_filenames)
 
 def load(filename, mode='rb'):
     '''Open a file in the data directory.
@@ -21,6 +26,6 @@
     "mode" is passed as the second arg to open().
     '''
     # convert unix path separator to platform appropriate one
-    filename = os.path.join(*filename.split("/"))
+    filename = unix_to_local(filename)
     return open(os.path.join(data_dir, filename), mode)