Follow up 6a17a60 - Fix error when passing usesgeometry to qgsfunction

Author: NathanW2

python/core/__init__.py

@@ -84,6 +84,5 @@ def add(values, *args):
     """
 
     def wrapper(func):
-        usesgeometry = kwargs.get('usesgeometry', False)
-        return register_function(func, args, group, usesgeometry, **kwargs)
+        return register_function(func, args, group, **kwargs)
     return wrapper

tests/src/python/test_qgsexpression.py

@@ -31,6 +31,10 @@ def special(values, feature, parent):
 	def sqrt(values, feature, parent):
 		pass
 
+	@qgsfunction(1, 'testing', register=False, usesgeometry=True)
+	def geomtest(values, feature, parent):
+		pass
+
 	def tearDown(self):
 		QgsExpression.unregisterFunction('testfun')
 
@@ -79,6 +83,10 @@ def testCantOverrideBuiltinsWithRegister(self):
 		success = QgsExpression.registerFunction(self.sqrt)
 		self.assertFalse(success)
 
+	def testCanRegisterGeometryFunction(self):
+		success = QgsExpression.registerFunction(self.geomtest)
+		self.assertTrue(success)
+
 	def testCantOverrideBuiltinsWithUnregister(self):
 		success = QgsExpression.unregisterFunction("sqrt")
 		self.assertFalse(success)
@@ -98,7 +106,7 @@ def testBlockComment(self):
 		expressions = {
 			"'test' /* comment */": 'test',
 			"/* comment */'test'": 'test',
-		    "/* comment */'test*/'": 'test*/',
+			"/* comment */'test*/'": 'test*/',
 			"/** comment */'test*/'": 'test*/',
 			"/* comment **/'test*/' /* comment */": 'test*/',
 			"'test/*'/* comment */": 'test/*',