Merge branch 'mike'

Conflicts:
	source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

1 files changed, 5 insertions, 5 deletions

diff --git a/src/sugar/tutorius/properties.py b/src/sugar/tutorius/properties.py
index 52993b8..a0bfa03 100644
--- a/src/sugar/tutorius/properties.py
+++ b/src/sugar/tutorius/properties.py
@@ -106,7 +106,7 @@ class TStringProperty(TutoriusProperty):
     def __init__(self, value, size_limit=None):
         TutoriusProperty.__init__(self)
         self._type = "string"
-        self.size_limit = SizeConstraint(size_limit)
+        self.size_limit = MaxSizeConstraint(size_limit)
         
         self.set(value)
     
@@ -115,11 +115,11 @@ class TArrayProperty(TutoriusProperty):
     Represents an array of properties. Can have a maximum number of element 
     limit, but there are no constraints on the content of the array.
     """
-    def __init__(self, value, size_limit=None):
+    def __init__(self, value, min_size_limit=None, max_size_limit=None):
         TutoriusProperty.__init__(self)
         self._type = "array"
-        self.size_limit = SizeConstraint(size_limit)
-        
+        self.max_size_limit = MaxSizeConstraint(max_size_limit)
+        self.min_size_limit = MinSizeConstraint(min_size_limit)
         self.set(value)
     
 class TColorProperty(TutoriusProperty):
@@ -185,7 +185,7 @@ class TEnumProperty(TutoriusProperty):
     
 class TBooleanProperty(TutoriusProperty):
     """
-    Represents a True of False value.
+    Represents a True or False value.
     """
     def __init__(self, value=False):
         TutoriusProperty.__init__(self)