Skip to content

Commit

Permalink
Make Mr. Travis happy
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Sep 29, 2017
1 parent 3562af4 commit e025011
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions python/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def _geometryNonZero(self):
def _isValid(self):
return self.isValid()


QgsGeometry.__nonzero__ = _geometryNonZero
QgsGeometry.__bool__ = _geometryNonZero

Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsfield.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsfield.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
*/
Expand Down
1 change: 1 addition & 0 deletions tests/src/python/test_qgsdefaultvalue.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ def setGetApplyOnUpdate(self):
value.setApplyOnUpdate(True)
self.assertEqual(value.applyOnUpdate(), True)


if __name__ == '__main__':
unittest.main()

0 comments on commit e025011

Please sign in to comment.