Changeset 468

Timestamp:

09/13/10 23:54:38 (21 months ago)

Author:

emuller

Message:

Alternate solution to psyco 32bit limitation & unwanted warnings

Location:

trunk/src

Files:

• __init__.py (modified) (2 diffs)
• signals/analogs.py (modified) (1 diff)
• signals/spikes.py (modified) (2 diffs)

trunk/src/__init__.py

@@ -69 +69 @@
 
 
+# Don't raise warnings for psyco on non-32bit systems
+if platform.machine() != 'i386':
+    dependencies['psyco']['check']=True
+
 #########################################################
 ## Function to display error messages on the dependencies
 #########################################################
 
-ARCH = platform.machine()
 
 class DependencyWarning(UserWarning):
@@ -100 +103 @@
    if tables.__version__<= 2: #1.4: #v[0] < 1 or (v[0] == 1 and v[1] < 4):
        raise Exception('PyTables version must be >= 1.4, installed version is %s' % __version__)
-
-def check_psyco_compatibility():
-    if ARCH == 'x86_64':
-        return False
-    else:
-        return True
 
 def check_dependency(name):

trunk/src/signals/analogs.py

@@ -32 +32 @@
 
 import os, re, numpy
-from NeuroTools import check_dependency, check_numpy_version, check_psyco_compatibility
+from NeuroTools import check_dependency, check_numpy_version
 from NeuroTools.io import *
 from NeuroTools.plotting import get_display, set_axis_limits, set_labels, SimpleMultiplot
 
-if check_psyco_compatibility():
-    if check_dependency('psyco'):
-        import psyco
-        psyco.full()
+if check_dependency('psyco'):
+    import psyco
+    psyco.full()
 
 from NeuroTools import check_dependency

trunk/src/signals/spikes.py

@@ -28 +28 @@
 import os, re, numpy
 import logging
-from NeuroTools import check_dependency, check_numpy_version, check_psyco_compatibility
+from NeuroTools import check_dependency, check_numpy_version
 try:
     from NeuroTools import analysis
@@ -39 +39 @@
 from intervals import *
 
-if check_psyco_compatibility():
-    if check_dependency('psyco'):
-        import psyco
-        psyco.full()
+if check_dependency('psyco'):
+    import psyco
+    psyco.full()
 
 from NeuroTools import check_dependency