1. wflow_bin

a. pcrut.py

1. line 10 - 17

try:

    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import *
except ImportError:
    from pcraster import *
    from pcraster.framework import *

b. wf_DynamicFramework.py

1. line 33 - 41
try:
    import PCRaster
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import *
except ImportError:
    import pcraster as PCRaster
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *

2. line 811 - 814
        try:
            import PCRaster
        except ImportError:
            import pcraster as PCRaster

3. line 879 - 882
        try:
            import PCRaster
        except ImportError:
            import pcraster as PCRaster

4. line 921 -922
  def setQuiet(self,quiet=True):
    self.showWarning("I'm not going to be quiet!!!!")

c. wf_Timeoutput.py

1. line 7 - 10

try:
    import PCRaster
except ImportError:
    import pcraster as PCRaster

2. line 43:

  if isinstance(idMap, str) or isinstance(idMap, PCRaster._pcraster.Field):

d. wflow_funcs.py

1. line 30 - 37

try:
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import * 
except ImportError:
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *

e. wflow_lib.py

1. line 42 - 49

try:
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import * 
except ImportError:
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *

2. PCRaster

a. python\pcraster\framework\dynamicBase.py

1. line 57 - 60

  def setQuiet(self,quiet=True):
    """  """
    msg = "Class needs to implement 'setQuiet' method"
    #raise NotImplementedError(msg)

b. python\pcraster\framework\frameworkBase.py

1. line 271 - 271:

  def setQuiet(self,
    quiet=True):

3. JEP

a. commands\python.py

1. line 10:

    return ['python' + sysconfig.get_config_var('VERSION'), 'dl', 'util']

4. OpenDA

a. WflowPythonToJavaAdapter.java:

1. line 568 - 569:

jep.eval("from pcraster import *");

--> line containing "jep.eval("from PCRaster.NumPy import *")" is removed. 

  • No labels