Make Mr. Travis happy

qgis · Sep 29, 2017 · e025011 · e025011
1 parent 3562af4
commit e025011
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -44,6 +44,7 @@ def _geometryNonZero(self):
 def _isValid(self):
     return self.isValid()
 
+
 QgsGeometry.__nonzero__ = _geometryNonZero
 QgsGeometry.__bool__ = _geometryNonZero
 

diff --git a/python/core/qgsfield.sip b/python/core/qgsfield.sip
@@ -191,8 +191,8 @@ Gets variant type of the field as it will be retrieved from data source
     void setDefaultValueDefinition( const QgsDefaultValue &defaultValueDefinition );
 %Docstring
  Sets an expression to use when calculating the default value for the field.
- \param expression expression to evaluate when calculating default values for field. Pass
- an empty expression to clear the default.
+ \param defaultValueDefinition expression to evaluate when calculating default values for field. Pass
+ a default constructed QgsDefaultValue() to reset.
 .. versionadded:: 3.0
 .. seealso:: defaultValueDefinition()
 %End

diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -203,8 +203,8 @@ class CORE_EXPORT QgsField
     QgsDefaultValue defaultValueDefinition() const;
 
     /** Sets an expression to use when calculating the default value for the field.
-     * \param expression expression to evaluate when calculating default values for field. Pass
-     * an empty expression to clear the default.
+     * \param defaultValueDefinition expression to evaluate when calculating default values for field. Pass
+     * a default constructed QgsDefaultValue() to reset.
      * \since QGIS 3.0
      * \see defaultValueDefinition()
      */

diff --git a/tests/src/python/test_qgsdefaultvalue.py b/tests/src/python/test_qgsdefaultvalue.py
@@ -40,5 +40,6 @@ def setGetApplyOnUpdate(self):
         value.setApplyOnUpdate(True)
         self.assertEqual(value.applyOnUpdate(), True)
 
+
 if __name__ == '__main__':
     unittest.main()