[Pyphant-devel] SF.net SVN: pyphant:[680] trunk/src/pyphant/pyphant

[<zk...@us...>]

Revision: 680
          http://pyphant.svn.sourceforge.net/pyphant/?rev=680&view=rev
Author:   zklaus
Date:     2010-05-22 19:29:18 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Fix: Bottle MS Windows
  Fix: Windows KM bugs

Modified Paths:
--------------
    trunk/src/pyphant/pyphant/core/KnowledgeManager.py
    trunk/src/pyphant/pyphant/core/bottle.py
    trunk/src/pyphant/pyphant/tests/TestKnowledgeManager.py

Modified: trunk/src/pyphant/pyphant/core/KnowledgeManager.py
===================================================================
--- trunk/src/pyphant/pyphant/core/KnowledgeManager.py	2010-05-22 17:33:17 UTC (rev 679)
+++ trunk/src/pyphant/pyphant/core/KnowledgeManager.py	2010-05-22 19:29:18 UTC (rev 680)
@@ -66,10 +66,12 @@
     """
     Returns a unique filename for the given emd5.
     """
-    emd5list = urlparse(dcId + '.h5')[2][2:].split('/')
+    emd5list = (dcId + '.h5')[7:].split('/')
     emd5path = os.path.join(
         *(emd5list[:-2] + [emd5list[-2][:10],
                            emd5list[-2][11:] + '.' + emd5list[-1]]))
+    #needed for windows version of pytables:
+    emd5path = emd5path.replace(':', '.')
     directory = os.path.dirname(emd5path)
     filename = os.path.basename(emd5path)
     if temporary:
@@ -265,10 +267,14 @@
         tmp_extension = ''
         if temporary:
             tmp_extension = 'tmp'
+        try:
+            remote_path = parsed.path
+        except AttributeError:
+            remote_path = parsed[2]
         directory = os.path.join(KM_PATH, tmp_extension,
-                                 'registered', parsed[1])
+                                 'registered')
         filename = os.path.join(getPyphantPath(directory),
-                                os.path.basename(parsed[2]))
+                                os.path.basename(remote_path))
         if os.path.exists(filename):
             i = 0
             directory = os.path.dirname(filename)

Modified: trunk/src/pyphant/pyphant/core/bottle.py
===================================================================
--- trunk/src/pyphant/pyphant/core/bottle.py	2010-05-22 17:33:17 UTC (rev 679)
+++ trunk/src/pyphant/pyphant/core/bottle.py	2010-05-22 19:29:18 UTC (rev 680)
@@ -470,8 +470,8 @@
 
 def send_file(filename, root, guessmime = True, mimetype = None):
     """ Aborts execution and sends a static files as response. """
-    root = os.path.abspath(root) + '/'
-    filename = os.path.abspath(os.path.join(root, filename.strip('/')))
+    root = os.path.abspath(root)
+    filename = os.path.abspath(os.path.join(root, filename))
 
     if not filename.startswith(root):
         abort(401, "Access denied.")

Modified: trunk/src/pyphant/pyphant/tests/TestKnowledgeManager.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestKnowledgeManager.py	2010-05-22 17:33:17 UTC (rev 679)
+++ trunk/src/pyphant/pyphant/tests/TestKnowledgeManager.py	2010-05-22 19:29:18 UTC (rev 680)
@@ -70,7 +70,12 @@
         ptp.saveResult(self._fc, h5)
         h5.close()
         km = KnowledgeManager.getInstance()
-        km.registerURL('file://' + h5name, temporary=True)
+        from urllib import pathname2url
+        url = pathname2url(h5name)
+        if not url.startswith('///'):
+            url = '//' + url
+        url = 'file:' + url
+        km.registerURL(url, temporary=True)
         km_fc = km.getDataContainer(self._fc.id)
         self.assertEqual(self._fc, km_fc)
         os.remove(h5name)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.