Changeset 364 for branches

Timestamp:

12/16/08 09:10:42 (3 years ago)

Author:

brizzi

Message:

Update of HDF5Tools and PythonObjects?. Before PIL and pyTables were considered as modules of NeuroTools. Now they are considered as independent packages in order to avoid imports like 'from NeuroTools.PIL import ...' or 'from NeuroTools.tables import ...'.

Location:

branches/packaged_tools/NeuroTools

Files:

• HDF5Tools/HDF5Factory/__init__.py (modified) (1 diff)
• HDF5Tools/HDF5Factory/generator.py (modified) (2 diffs)
• HDF5Tools/HDF5Factory/highlevel.py (modified) (3 diffs)
• HDF5Tools/HDF5Factory/navigator.py (modified) (1 diff)
• HDF5Tools/HDF5Factory/randomizer.py (modified) (1 diff)
• HDF5Tools/HDF5Factory/structure.py (modified) (1 diff)
• HDF5Tools/HDF5Objects/__init__.py (modified) (1 diff)
• HDF5Tools/HDF5Objects/h5image.py (modified) (1 diff)
• HDF5Tools/HDF5Objects/h5movie.py (modified) (1 diff)
• HDF5Tools/HDF5Objects/h5spiketrain.py (modified) (1 diff)
• HDF5Tools/__init__.py (modified) (1 diff)
• HDF5Tools/h5objects_tests.py (modified) (1 diff)
• PythonObjects/__init__.py (modified) (1 diff)
• __init__.py (modified) (1 diff)

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/__init__.py

@@ -1 @@
-__path__.append('/home/thierry/NeuroTools_Project/NeuroTools/HDF5Tools')
+__path__.append('H:/Thierry/NeuroTools_Project/NeuroTools/HDF5Tools')
 __all__ = ['highlevel', 'generator', 'navigator', 'structure', 'randomizer']
 

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/generator.py

@@ -14 +14 @@
 """
 
-from ..tables.parameters import EXPECTED_ROWS_TABLE
-from ..tables.file import _checkfilters
+from tables.parameters import EXPECTED_ROWS_TABLE
+from tables.file import _checkfilters
 from NeuroTools.PythonObjects.spikes import SpikeTrain, SpikeList
 from NeuroTools.HDF5Tools.HDF5Objects import h5spiketrain, h5spikelist, h5serializer, h5image, h5movie
-from ..tables import File, Node, Atom, Filters
+from tables import File, Node, Atom, Filters
 
 class HDF5Object(File) :
@@ -60 +60 @@
             for tag in tags :
                 setattr(group, tag, tags[tag])
-        return tables
+        return table
 
     def createArray(self, where, name, object, tags=None, title='', 

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/highlevel.py

@@ -16 +16 @@
 """
 
-from ..tables.parameters import NODE_MAX_SLOTS, METADATA_CACHE_SIZE
+from tables.parameters import NODE_MAX_SLOTS, METADATA_CACHE_SIZE
 from randomizer import *
 from structure import * 
 import urllib
 from numpy import ndarray, array, dtype
-from ..tables import Atom
+from tables import Atom
 from NeuroTools.HDF5Tools.HDF5Objects.h5serializer import H5Serializer
 import os.path
@@ -91 +91 @@
     """
     assert mode in ['a', 'w', 'r', 'r+'], "mode must be chosen from : 'a', 'w', 'r', 'r+'"
-    assert len(url.split('//')) > 1, "wrong url format."
-    try :
-        file = urllib.urlretrieve(url)[0]
-    except :
+    #assert len(url.split('//')) > 1, "wrong url format."
+    url_split = url.split('//')
+    if len(url_split) > 1 :
+        try :
+            file = urllib.urlretrieve(url)[0]
+        except :
+            file = url_split[-1]
+            if mode in ['r', 'r+'] :
+                assert os.path.exists(file), "The file must at least exist locally in r and r+ modes."
+    else :
+        file = url
         if mode in ['r', 'r+'] :
-            raise Exception("The file must at least exist locally in r and r+ modes.")
-        else :
-            file = url.split('//')[-1]
-##        raise Exception("Cannot open the specified url.")
+            assert os.path.exists(file), "The file must at least exist locally in r and r+ modes."
     # Expand the form '~user'
     path = os.path.expanduser(file)
@@ -105 +109 @@
     path = os.path.expandvars(path)
     # Finally, create the File instance, and return it
+    print path
     return HDF5File(path, mode, title, trMap, rootUEP, filters, METADATA_CACHE_SIZE, nodeCacheSize)
 

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/navigator.py

@@ -15 +15 @@
 
 from .generator import HDF5Object
-from ..tables import Group
+from tables import Group
 import time
 import os

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/randomizer.py

@@ -17 +17 @@
 from math import log
 from time import time
-from ..tables import Filters
-from ..tables.atom import Int64Atom, Float64Atom, BoolAtom, StringAtom
-from ..tables import StringCol, BoolCol, Int64Col, Float64Col, Int32Col
+from tables import Filters
+from tables.atom import Int64Atom, Float64Atom, BoolAtom, StringAtom
+from tables import StringCol, BoolCol, Int64Col, Float64Col, Int32Col
 from numpy import array
 from NeuroTools.PythonObjects.spikes import SpikeTrain, SpikeList

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Factory/structure.py

@@ -14 +14 @@
 """
 
-from ..tables import Group, Leaf, Filters, Node
+from tables import Group, Leaf, Filters, Node
 from NeuroTools.PythonObjects.spikes import SpikeTrain, SpikeList
 from NeuroTools.HDF5Tools.HDF5Objects import h5spiketrain, h5spikelist, h5image, h5movie,h5serializer
-from NeuroTools.PIL import Image
+from PIL import Image
 from navigator import *
 from os.path import exists

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Objects/__init__.py

@@ -1 @@
-__path__.append('/home/thierry/NeuroTools_Project/NeuroTools/HDF5Tools')
+__path__.append('H:/Thierry/NeuroTools_Project/NeuroTools/HDF5Tools')
 __all__ = ['h5spiketrain', 'h5spikelist', 'h5serializer', 'h5image', 'h5movie']

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Objects/h5image.py

@@ -12 +12 @@
 """
 
-from ..tables import CArray, Table, VLArray, Atom
-from ..tables import UInt8Atom, Filters
-from ..PIL import Image
+from tables import CArray, Table, VLArray, Atom
+from tables import UInt8Atom, Filters
+from PIL import Image
 import urllib
 

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Objects/h5movie.py

@@ -13 +13 @@
 
 from numpy import array, around, newaxis
-from ..tables import Table, CArray, UInt8Atom, Filters, VLArray, Atom, Float64Atom
-from ..PIL import Image
+from tables import Table, CArray, UInt8Atom, Filters, VLArray, Atom, Float64Atom
+from PIL import Image
 import os
 import os.path

branches/packaged_tools/NeuroTools/HDF5Tools/HDF5Objects/h5spiketrain.py

@@ -14 +14 @@
 #TODO : work on data precision
 
-from ..tables import Filters
-from ..tables import CArray
+from tables import Filters
+from tables import CArray
 ##from tables.description import IsDescription, Int64Col, UInt8Col, UInt64Col, Float64Col
-from ..tables import Int64Atom
+from tables import Int64Atom
 #from numpy import rand, floor, log #TODO use numpy instead
 #from random import randint

branches/packaged_tools/NeuroTools/HDF5Tools/__init__.py

@@ -1 @@
-__path__.append('/home/thierry/NeuroTools_Project/NeuroTools')
+__path__.append('H:/Thierry/NeuroTools_Project/NeuroTools')
 __all__ = ['HDF5Objects', 'HDF5Factory']
 

branches/packaged_tools/NeuroTools/HDF5Tools/h5objects_tests.py

@@ -1 +1 @@
 import sys
-sys.path.append('/home/thierry/NeuroTools_Project')
+sys.path.append('H:/Thierry/NeuroTools_Project')
 from NeuroTools.HDF5Tools.HDF5Factory.highlevel import openH5File, HDF5File
-from NeuroTools.PIL import Image
+from PIL import Image
 from tables import Leaf, CArray, Group
 from NeuroTools.PythonObjects.spikes import SpikeTrain, SpikeList

branches/packaged_tools/NeuroTools/PythonObjects/__init__.py

@@ -1 @@
-__path__.append('/home/thierry/NeuroTools_Project/NeuroTools')
+__path__.append('H:/Thierry/NeuroTools_Project/NeuroTools')
 __all__ = ['spikes']

branches/packaged_tools/NeuroTools/__init__.py

@@ -1 @@
-__path__.append('/home/thierry/NeuroTools_Project')
-__path__.append('/usr/lib/python2.5/site-packages')
-__all__ = ['PIL', 'tables', 'PythonObjects', 'HDF5Tools']
+__path__.append('H:/Thierry/NeuroTools_Project')
+__all__ = ['PythonObjects', 'HDF5Tools']