Changeset 1046

Timestamp:

04/28/06 11:41:23 (19 years ago)

Author:

mar637

Message:

merge from trunk

Location:

branches/Release2.0/python

Files:

• __init__.py (modified) (1 diff)
• selector.py (modified) (6 diffs)

branches/Release2.0/python/__init__.py

@@ -307 +307 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.0b'
+__version__  = '2.0'
 
 if rcParams['verbose']:

branches/Release2.0/python/selector.py

@@ -38 +38 @@
         """
         vec = _to_list(pols, str) or _to_list(pols, int)
-        if vec: # is an empty and/or valid vector
+        if isinstance(vec, list): # is an empty and/or valid vector
             if len(vec) and isinstance(vec[-1],str):
                 self._setpolstrings(vec)
@@ -53 +53 @@
         """
         vec = _to_list(ifs, int)
-        if vec:
+        if isinstance(vec,list):
             self._setifs(vec)
         else:
@@ -65 +65 @@
         """
         vec = _to_list(scans, int)
-        if vec:
+        if isinstance(vec,list):
             self._setscans(vec)
         else:
@@ -77 +77 @@
         """
         vec = _to_list(beams, int)
-        if vec:
+        if isinstance(vec,list):
             self._setbeams(vec)
         else:
@@ -89 +89 @@
         """
         vec = _to_list(cycles, int)
-        if vec:
+        if isinstance(vec,list):
             self._setcycles(vec)
         else:
@@ -139 +139 @@
         Set the order the scantable should be sorted by.
         Parameters:
-            order:    The list of column nmaes to sort by in order
+            order:    The list of column names to sort by in order
         """
         self._setorder(order)