gdal_fillnodata.py, gdal_pansharpen.py, gdal_polygonize.py, gdal_prox…

…imity.py, gdal_sieve.py, rgb2pct.py: avoid potential problem on Windows in verbose mode (fixes #458)
OSGeo · Apr 20, 2018 · 1121758 · 1121758
1 parent 999b168
commit 1121758
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 21 deletions.
diff --git a/gdal/swig/include/python/callback.i b/gdal/swig/include/python/callback.i
@@ -50,6 +50,7 @@ PyProgressProxy( double dfComplete, const char *pszMessage, void *pData )
 
     if( PyErr_Occurred() != NULL )
     {
+        PyErr_Print();
         PyErr_Clear();
         SWIG_PYTHON_THREAD_END_BLOCK;
         return FALSE;

diff --git a/gdal/swig/python/extensions/gdal_array_wrap.cpp b/gdal/swig/python/extensions/gdal_array_wrap.cpp
@@ -4078,6 +4078,7 @@ PyProgressProxy( double dfComplete, const char *pszMessage, void *pData )
 
     if( PyErr_Occurred() != NULL )
     {
+        PyErr_Print();
         PyErr_Clear();
         SWIG_PYTHON_THREAD_END_BLOCK;
         return FALSE;

diff --git a/gdal/swig/python/extensions/gdal_wrap.cpp b/gdal/swig/python/extensions/gdal_wrap.cpp
@@ -3721,6 +3721,7 @@ PyProgressProxy( double dfComplete, const char *pszMessage, void *pData )
 
     if( PyErr_Occurred() != NULL )
     {
+        PyErr_Print();
         PyErr_Clear();
         SWIG_PYTHON_THREAD_END_BLOCK;
         return FALSE;

diff --git a/gdal/swig/python/extensions/gnm_wrap.cpp b/gdal/swig/python/extensions/gnm_wrap.cpp
@@ -3428,6 +3428,7 @@ PyProgressProxy( double dfComplete, const char *pszMessage, void *pData )
 
     if( PyErr_Occurred() != NULL )
     {
+        PyErr_Print();
         PyErr_Clear();
         SWIG_PYTHON_THREAD_END_BLOCK;
         return FALSE;

diff --git a/gdal/swig/python/extensions/ogr_wrap.cpp b/gdal/swig/python/extensions/ogr_wrap.cpp
@@ -3486,6 +3486,7 @@ PyProgressProxy( double dfComplete, const char *pszMessage, void *pData )
 
     if( PyErr_Occurred() != NULL )
     {
+        PyErr_Print();
         PyErr_Clear();
         SWIG_PYTHON_THREAD_END_BLOCK;
         return FALSE;

diff --git a/gdal/swig/python/scripts/gdal_fillnodata.py b/gdal/swig/python/scripts/gdal_fillnodata.py
@@ -193,7 +193,7 @@ def Usage():
 if quiet_flag:
     prog_func = None
 else:
-    prog_func = gdal.TermProgress
+    prog_func = gdal.TermProgress_nocb
 
 result = gdal.FillNodata(dstband, maskband,
                          max_distance, smoothing_iterations, options,

diff --git a/gdal/swig/python/scripts/gdal_merge.py b/gdal/swig/python/scripts/gdal_merge.py
@@ -37,10 +37,7 @@
 
 from osgeo import gdal
 
-try:
-    progress = gdal.TermProgress_nocb
-except AttributeError:
-    progress = gdal.TermProgress
+progress = gdal.TermProgress_nocb
 
 __version__ = '$id$'[5:-1]
 verbose = 0

diff --git a/gdal/swig/python/scripts/gdal_pansharpen.py b/gdal/swig/python/scripts/gdal_pansharpen.py
@@ -111,7 +111,7 @@ def gdal_pansharpen(argv):
     weights = []
     format = None
     creation_options = []
-    callback = gdal.TermProgress
+    callback = gdal.TermProgress_nocb
     resampling = None
     spat_adjust = None
     verbose_vrt = False

diff --git a/gdal/swig/python/scripts/gdal_polygonize.py b/gdal/swig/python/scripts/gdal_polygonize.py
@@ -263,7 +263,7 @@ def GetOutputDriverFor(filename):
 if quiet_flag:
     prog_func = None
 else:
-    prog_func = gdal.TermProgress
+    prog_func = gdal.TermProgress_nocb
 
 result = gdal.Polygonize(srcband, maskband, dst_layer, dst_field, options,
                          callback=prog_func)

diff --git a/gdal/swig/python/scripts/gdal_proximity.py b/gdal/swig/python/scripts/gdal_proximity.py
@@ -231,7 +231,7 @@ def GetOutputDriverFor(filename):
 if quiet_flag:
     prog_func = None
 else:
-    prog_func = gdal.TermProgress
+    prog_func = gdal.TermProgress_nocb
 
 gdal.ComputeProximity(srcband, dstband, options,
                       callback=prog_func)

diff --git a/gdal/swig/python/scripts/gdal_retile.py b/gdal/swig/python/scripts/gdal_retile.py
@@ -37,10 +37,7 @@
 from osgeo import ogr
 from osgeo import osr
 
-try:
-    progress = gdal.TermProgress_nocb
-except AttributeError:
-    progress = gdal.TermProgress
+progress = gdal.TermProgress_nocb
 
 
 class AffineTransformDecorator:

diff --git a/gdal/swig/python/scripts/gdal_sieve.py b/gdal/swig/python/scripts/gdal_sieve.py
@@ -224,7 +224,7 @@ def GetOutputDriverFor(filename):
 if quiet_flag:
     prog_func = None
 else:
-    prog_func = gdal.TermProgress
+    prog_func = gdal.TermProgress_nocb
 
 result = gdal.SieveFilter(srcband, maskband, dstband,
                           threshold, connectedness,

diff --git a/gdal/swig/python/scripts/pct2rgb.py b/gdal/swig/python/scripts/pct2rgb.py
@@ -35,10 +35,7 @@
 
 from osgeo import gdal
 
-try:
-    progress = gdal.TermProgress_nocb
-except AttributeError:
-    progress = gdal.TermProgress
+progress = gdal.TermProgress_nocb
 
 try:
     import numpy as Numeric

diff --git a/gdal/swig/python/scripts/rgb2pct.py b/gdal/swig/python/scripts/rgb2pct.py
@@ -165,8 +165,7 @@ def GetOutputDriverFor(filename):
                                    src_ds.GetRasterBand(2),
                                    src_ds.GetRasterBand(3),
                                    color_count, ct,
-                                   callback=gdal.TermProgress,
-                                   callback_data='Generate PCT')
+                                   callback=gdal.TermProgress_nocb)
 else:
     pct_ds = gdal.Open(pct_filename)
     ct = pct_ds.GetRasterBand(1).GetRasterColorTable().Clone()
@@ -203,8 +202,7 @@ def GetOutputDriverFor(filename):
                          src_ds.GetRasterBand(3),
                          tif_ds.GetRasterBand(1),
                          ct,
-                         callback=gdal.TermProgress,
-                         callback_data='Generate PCT')
+                         callback=gdal.TermProgress_nocb)
 
 tif_ds = None