Merge branch 'master' of git://github.com/nursix/eden

modules/plugins/__init__.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# @status: fixed for Py3
-
 import os
 import sys
 

modules/s3/__init__.py

@@ -34,8 +34,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 # Import all names from the S3 modules that shall be accessible
 # under the s3base namespace:

modules/s3/codecs/card.py

@@ -26,8 +26,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3PDFCard",

modules/s3/codecs/pdf.py

@@ -26,8 +26,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3RL_PDF",)

modules/s3/codecs/shp.py

@@ -26,8 +26,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3SHP",)

modules/s3/codecs/svg.py

@@ -26,8 +26,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3SVG",)

modules/s3/codecs/xls.py

@@ -26,8 +26,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3XLS",

modules/s3/s3aaa.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("AuthS3",

modules/s3/s3anonymize.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 import json

modules/s3/s3codec.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Codec",)

modules/s3/s3crud.py

@@ -30,8 +30,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3CRUD",)

modules/s3/s3dashboard.py

@@ -29,7 +29,6 @@
     OTHER DEALINGS IN THE SOFTWARE.
 
     @status: experimental, work in progress
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Dashboard",

modules/s3/s3data.py

@@ -28,8 +28,6 @@
 
     @group Data Views: S3DataTable,
                        S3DataList
-
-    @status: fixed for Py3
 """
 
 import re

modules/s3/s3datetime.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("ISOFORMAT",

modules/s3/s3delete.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 import json

modules/s3/s3error.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 # =============================================================================

modules/s3/s3export.py

@@ -29,8 +29,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Exporter",)

modules/s3/s3fields.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 import datetime

modules/s3/s3filter.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3FilterWidget",

modules/s3/s3forms.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3SQLCustomForm",

modules/s3/s3grouped.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3GroupedItemsReport",

modules/s3/s3hierarchy.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Hierarchy", "S3HierarchyCRUD")

modules/s3/s3import.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 # @todo: remove all interactive error reporting out of the _private methods,

modules/s3/s3merge.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 from gluon import current, IS_NOT_IN_DB, \

modules/s3/s3mobile.py

@@ -27,8 +27,6 @@
     OTHER DEALINGS IN THE SOFTWARE.
 
     @todo: integrate S3XForms API
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3MobileFormList",
@@ -224,6 +222,8 @@ class S3MobileSchema(object):
                              "boolean",
                              "reference",
                              "upload",
+                             "list:string",
+                             "list:integer",
                              )
 
     # -------------------------------------------------------------------------
@@ -514,7 +514,7 @@ def get_options(field, lookup=None):
             #    for proper authorization, customise_* and filtering
             return None
 
-        elif fieldtype in ("string", "integer"):
+        elif fieldtype in ("string", "integer", "list:string", "list:integer"):
 
             # Check for IS_IN_SET, and extract the options
             if isinstance(requires, IS_IN_SET):

modules/s3/s3model.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Model",
@@ -1963,7 +1961,9 @@ def _generic_field(tablename, row):
         fieldname = row.name
         fieldtype = row.field_type
 
-        if row.require_unique:
+        multiple = fieldtype[:5] == "list:"
+
+        if row.require_unique and not multiple:
             from .s3validators import IS_NOT_ONE_OF
             requires = IS_NOT_ONE_OF(current.db, "%s.%s" % (tablename,
                                                             fieldname,
@@ -2017,6 +2017,7 @@ def _options_field(tablename, row):
 
         from .s3utils import s3_str
 
+        multiple = fieldtype[:5] == "list:"
         sort = False
         zero = ""
 
@@ -2047,29 +2048,56 @@ def _options_field(tablename, row):
 
         # Apply default value (if it is a valid option)
         default = row.default_value
-        if default and s3_str(default) in (s3_str(k) for k in options_dict):
-            # No zero-option if we have a default value and
-            # the field must not be empty:
-            zero = None if row.require_not_empty else ""
-        else:
-            default = None
+        if default is not None:
+            if multiple:
+                if default and default[0] == "[":
+                    # Attempt to JSON-parse the default value
+                    import json
+                    from .s3validators import JSONERRORS
+                    try:
+                        default = json.loads(default)
+                    except JSONERRORS:
+                        pass
+                if not isinstance(default, list):
+                    default = [default]
+                zero = None
+            elif s3_str(default) in (s3_str(k) for k in options_dict):
+                # No zero-option if we have a default value and
+                # the field must not be empty:
+                zero = None if row.require_not_empty else ""
+            else:
+                default = None
 
         # Widget?
-        #widget = settings.get("widget")
-        #if widget == "radio":
+        widget = settings.get("widget")
         len_options = len(options)
-        if len_options < 4:
-            widget = lambda field, value: SQLFORM.widgets.radio.widget(field, value, cols=len_options)
+        if multiple:
+            if widget and widget == "groupedopts" or \
+               not widget and len_options < 8:
+                from .s3widgets import S3GroupedOptionsWidget
+                widget = S3GroupedOptionsWidget(cols=4)
+            else:
+                from .s3widgets import S3MultiSelectWidget
+                widget = S3MultiSelectWidget()
+        elif widget and widget == "radio" or \
+             not widget and len_options < 4:
+            widget = lambda field, value: \
+                         SQLFORM.widgets.radio.widget(field,
+                                                      value,
+                                                      cols = len_options,
+                                                      )
         else:
             widget = None
 
         from .s3fields import S3Represent
         field = Field(fieldname, fieldtype,
                       default = default,
                       represent = S3Represent(options = options_dict,
+                                              multiple = multiple,
                                               translate = translate,
                                               ),
                       requires = IS_IN_SET(options,
+                                           multiple = multiple,
                                            sort = sort,
                                            zero = zero,
                                            ),

modules/s3/s3msg.py

@@ -31,8 +31,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Msg",

modules/s3/s3navigation.py

@@ -32,8 +32,6 @@
            - add site-map generator and renderer (easy)
            - rewrite action buttons/links as S3NavigationItems
            - ...and any todo's in the code
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3NavigationItem",

modules/s3/s3notify.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 import datetime

modules/s3/s3organizer.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Organizer",

modules/s3/s3parser.py

@@ -27,8 +27,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 __all__ = ("S3Parsing",)

modules/s3/s3pdf.py

@@ -38,8 +38,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3 (just syntax, functionality broken as for Py2)
 """
 
 __all__ = ("S3PDF",)

modules/s3/s3profile.py

@@ -25,8 +25,6 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-    @status: fixed for Py3
 """
 
 from gluon import current, redirect