diff --git a/schainpy/cli/cli.py b/schainpy/cli/cli.py index 8c04d8d..8873109 100644 --- a/schainpy/cli/cli.py +++ b/schainpy/cli/cli.py @@ -4,8 +4,6 @@ import subprocess import os import sys import glob -save_stdout = sys.stdout -sys.stdout = open('/dev/null', 'w') from multiprocessing import cpu_count from schainpy.controller import Project from schainpy.model import Operation, ProcessingUnit @@ -19,7 +17,6 @@ try: from queue import Queue except: from Queue import Queue -sys.stdout = save_stdout def getProcs(): @@ -45,11 +42,19 @@ def getOperations(): def getArgs(op): module = locate('schainpy.model.{}'.format(op)) - - if hasattr(module, '__attrs__'): - args = module.__attrs__ + try: + obj = module(1,2,3,Queue(),5,6) + except: + obj = module() + + if hasattr(obj, '__attrs__'): + args = obj.__attrs__ else: - args = inspect.getargspec(module.run).args + if hasattr(obj, 'myrun'): + args = inspect.getfullargspec(obj.myrun).args + else: + args = inspect.getfullargspec(obj.run).args + try: args.remove('self') except Exception as e: @@ -148,7 +153,7 @@ def search(nextcommand): if nextcommand is None: log.error('There is no Operation/ProcessingUnit to search', '') else: - try: + try: args = getArgs(nextcommand) doc = getDoc(nextcommand) if len(args) == 0: diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py index f0cf564..743703a 100644 --- a/schainpy/model/io/jroIO_digitalRF.py +++ b/schainpy/model/io/jroIO_digitalRF.py @@ -29,7 +29,7 @@ import pickle try: import digital_rf except: - print('You should install "digital_rf" module if you want to read Digital RF data') + pass @MPDecorator class DigitalRFReader(ProcessingUnit): diff --git a/schainpy/model/io/jroIO_heispectra.py b/schainpy/model/io/jroIO_heispectra.py index 69b81a3..3a144d0 100644 --- a/schainpy/model/io/jroIO_heispectra.py +++ b/schainpy/model/io/jroIO_heispectra.py @@ -14,7 +14,7 @@ from time import sleep try: import pyfits except ImportError as e: - print("Fits data cannot be used. Install pyfits module") + pass from xml.etree.ElementTree import ElementTree diff --git a/schainpy/model/io/jroIO_madrigal.py b/schainpy/model/io/jroIO_madrigal.py index d99145c..c587169 100644 --- a/schainpy/model/io/jroIO_madrigal.py +++ b/schainpy/model/io/jroIO_madrigal.py @@ -23,9 +23,7 @@ from schainpy.utils import log try: import madrigal.cedar except: - log.warning( - 'You should install "madrigal library" module if you want to read/write Madrigal data' - ) + pass try: basestring diff --git a/schainpy/model/io/jroIO_usrp.py b/schainpy/model/io/jroIO_usrp.py index c58254f..06d2d3c 100644 --- a/schainpy/model/io/jroIO_usrp.py +++ b/schainpy/model/io/jroIO_usrp.py @@ -19,7 +19,7 @@ from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation try: import digital_rf_hdf5 except: - print('You should install "digital_rf_hdf5" module if you want to read USRP data') + pass class USRPReader(ProcessingUnit): ''' diff --git a/schainpy/model/io/pxIO_param.py b/schainpy/model/io/pxIO_param.py index c3e23c5..86d6755 100644 --- a/schainpy/model/io/pxIO_param.py +++ b/schainpy/model/io/pxIO_param.py @@ -23,9 +23,7 @@ from schainpy.utils import log try: from netCDF4 import Dataset except: - log.warning( - 'You should install "netCDF4" module if you want to read/write NCDF files' - ) + pass UT1970 = datetime.datetime(1970, 1, 1) - datetime.timedelta(seconds=time.timezone) diff --git a/schainpy/model/utils/jroutils_ftp.py b/schainpy/model/utils/jroutils_ftp.py index a1cc981..8be1671 100644 --- a/schainpy/model/utils/jroutils_ftp.py +++ b/schainpy/model/utils/jroutils_ftp.py @@ -9,7 +9,7 @@ try: import paramiko import scp except: - print("You should install paramiko and scp libraries \nif you want to use SSH protocol to upload files to the server") + pass import time