log python warnings and enabled deprecation warnings

jef-n · jef-n · commit f2029b4ec487 · 2013-01-24T03:08:20.000+01:00
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -105,7 +105,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
         OUTPUT ${_sip_output_files} 
         COMMAND ${CMAKE_COMMAND} -E echo ${message}
         COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} 
-        COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
+        COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
         DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
     )
     # not sure if type MODULE could be uses anywhere, limit to cygwin for now
diff --git a/python/utils.py b/python/utils.py
@@ -28,19 +28,29 @@
 
 """
 
-from PyQt4.QtCore import QCoreApplication,QLocale, QString
-from qgis.core import QGis, QgsExpression
+from PyQt4.QtCore import QCoreApplication, QLocale, QString
+from qgis.core import QGis, QgsExpression, QgsMessageLog
 from string import Template
 import sys
 import traceback
 import glob
 import os.path
 import re
 import ConfigParser
+import warnings
 
 #######################
 # ERROR HANDLING
 
+warnings.simplefilter('default')
+
+def showWarning(message, category, filename, lineno, file=None, line=None):
+  QgsMessageLog.logMessage(
+    warnings.formatwarning(message, category, filename, lineno),
+    QCoreApplication.translate( "Python", "Python" )
+  )
+warnings.showwarning = showWarning
+
 def showException(type, value, tb, msg):
   lst = traceback.format_exception(type, value, tb)
   if msg == None:

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)`
`105`	`105`	`OUTPUT ${_sip_output_files}`
`106`	`106`	`COMMAND ${CMAKE_COMMAND} -E echo ${message}`
`107`	`107`	`COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}`
`108`		`- COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}`
	`108`	`+ COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}`
`109`	`109`	`DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}`
`110`	`110`	`)`
`111`	`111`	`# not sure if type MODULE could be uses anywhere, limit to cygwin for now`