Standardize python property vs function on Property class. Refs #6677

Now behaves more consistently and like the original.

Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp

@@ -32,22 +32,35 @@ void export_Property()
     .value("None", Direction::None)
     ;
 
+  // Add properties as that's what old version had
   class_<Property, boost::noncopyable>("Property", no_init)
     .add_property("name", make_function(&Mantid::Kernel::Property::name, return_value_policy<copy_const_reference>()),
                   "The name of the property")
-    .add_property("documentation", make_function(&Mantid::Kernel::Property::documentation, return_value_policy<copy_const_reference>()),
-                  "The property's doc string")
+
+    .add_property("isValid", make_function(&Mantid::Kernel::Property::isValid), 
+                  "An empty string if the property is valid, otherwise it contains an error message.")
+
+    .add_property("isDefault", make_function(&Mantid::Kernel::Property::isDefault), "Is the property set at the default value")
+
+    .add_property("getDefault", make_function(&Mantid::Kernel::Property::getDefault), "Get the default value as a string")
+
     .add_property("direction", &Mantid::Kernel::Property::direction,
                   "Input, Output, InOut or Unknown. See the Direction class")
+
+    .add_property("documentation", make_function(&Mantid::Kernel::Property::documentation, return_value_policy<copy_const_reference>()),
+                  "The property's doc string")
+
     .add_property("type", make_function(&Mantid::Kernel::Property::type), "Returns a string identifier for the type")
+
     .add_property("units", make_function(&Mantid::Kernel::Property::units, return_value_policy<copy_const_reference>()),
                   "The units attached to this property")
+
     .add_property("valueAsStr", &Mantid::Kernel::Property::value, "The value of the property as a string. "
                   "For some property types, e.g. Workspaces, it is useful to be able to refer to the string value directly")
+
     .add_property("allowedValues", &Mantid::Kernel::Property::allowedValues, "A list of allowed values")
-    .def("isValid", &Mantid::Kernel::Property::isValid, "An empty string if the property is valid, otherwise it contains an error message.")
-    .def("isDefault", &Mantid::Kernel::Property::isDefault, "Is the property set at the default value")
-    .def("getGroup", &Mantid::Kernel::Property::getGroup, return_value_policy<copy_const_reference>(),
+
+    .add_property("getGroup", make_function(&Mantid::Kernel::Property::getGroup, return_value_policy<copy_const_reference>()),
          "Return the 'group' of the property, that is, the header in the algorithm's list of properties.")
    ;
 }

Code/Mantid/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py

@@ -7,27 +7,27 @@ class FilePropertyTest(unittest.TestCase):
 
     def test_constructor_with_name_and_default_and_action(self):
         prop = FileProperty("LoadProperty", "", FileAction.Load)
-        self.assertNotEquals("", prop.isValid())
+        self.assertNotEquals("", prop.isValid)
         self.assertEquals(Direction.Input, prop.direction)
 
     def test_constructor_with_name_and_default_and_action_and_exts_list(self):
         prop = FileProperty("LoadProperty", "", FileAction.Load, ['.nxs', '.raw'])
-        self.assertNotEquals("", prop.isValid())
+        self.assertNotEquals("", prop.isValid)
         self.assertEquals(Direction.Input, prop.direction)
         allowed = prop.allowedValues
         self.assertTrue('.nxs' in allowed)
         self.assertTrue('.raw' in allowed)
 
     def test_constructor_with_name_and_default_and_action_and_single_ext(self):
         prop = FileProperty("LoadProperty", "", FileAction.Load, '.nxs')
-        self.assertNotEquals("", prop.isValid())
+        self.assertNotEquals("", prop.isValid)
         self.assertEquals(Direction.Input, prop.direction)
         allowed = prop.allowedValues
         self.assertTrue('.nxs' in allowed)
 
     def test_constructor_with_name_and_default_and_action_and_single_ext_and_direction(self):
         prop = FileProperty("LoadProperty", "", FileAction.Load, ['.nxs'], Direction.InOut)
-        self.assertNotEquals("", prop.isValid())
+        self.assertNotEquals("", prop.isValid)
         self.assertEquals(Direction.InOut, prop.direction)
 
     def test_alg_get_property_converts_to_this(self):

Code/Mantid/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py

@@ -82,7 +82,7 @@ def PyExec(self):
 
         def_dir = alg.getProperty("NumPropWithDefaultDir")
         self.assertEquals(def_dir.direction, Direction.Input)
-        self.assertNotEquals("", def_dir.isValid())
+        self.assertNotEquals("", def_dir.isValid)
         self.assertRaises(ValueError, alg.setProperty, "NumPropWithDefaultDir", -10)
         testhelpers.assertRaisesNothing(self, alg.setProperty, "NumPropWithDefaultDir", 11)
 

Code/Mantid/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py

@@ -43,7 +43,7 @@ def test_name_validator_direction_constructor_gives_correct_object(self):
         validator = NullValidator()
         arr = FloatArrayProperty(name, validator, direc)
         self._check_object_attributes(arr, name, direc)
-        self.assertEquals(arr.isValid(), "")
+        self.assertEquals(arr.isValid, "")
 
     def test_name_string_values_validator_direction_constructor_gives_correct_object(self):
         """
@@ -55,7 +55,7 @@ def test_name_string_values_validator_direction_constructor_gives_correct_object
         values_str = "1.345,34.2,5345.3,4,5.3948"
         arr = FloatArrayProperty(name, values_str, validator, direc)
         self._check_object_attributes(arr, name, direc, length = 5)
-        self.assertEquals(arr.isValid(), "")
+        self.assertEquals(arr.isValid, "")
         values = arr.value
         self.assertTrue(isinstance(values, np.ndarray))
 

Code/Mantid/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py

@@ -25,9 +25,9 @@ def _do_validation_test(self, validation):
         """Run the validator tests"""
         test_alg = self._create_test_algorithm(validation)
         prop = test_alg.getProperty("Input")
-        self.assertNotEquals(prop.isValid(), "")
+        self.assertNotEquals(prop.isValid, "")
         test_alg.setProperty("Input", 6.8)
-        self.assertEquals(prop.isValid(), "")
+        self.assertEquals(prop.isValid, "")
         self.assertRaises(ValueError, test_alg.setProperty, "Input", 15)
 
     def _create_test_algorithm(self, validator):