Merge branch '2.x-line' into dev

Author: sloria

CHANGELOG.rst

@@ -38,6 +38,13 @@ Deprecation/Removals:
 - Remove ``func`` parameter of ``fields.Function``. Remove ``method_name`` parameter of ``fields.Method`` (issue:`325`). Use the ``serialize`` parameter instead.
 - Remove ``extra`` parameter from ``Schema``. Use a ``@post_dump`` method to add additional data.
 
+2.13.3 (2017-03-11)
++++++++++++++++++++
+
+Bug fixes:
+
+- Restore backwards-compatibility of ``SchemaOpts`` constructor (:issue:`597`). Thanks :user:`Wesmania` for reporting and thanks :user:`frol` for the fix.
+
 2.13.2 (2017-03-10)
 +++++++++++++++++++
 

marshmallow/schema.py

@@ -100,7 +100,9 @@ def __new__(mcs, name, bases, attrs):
         meta = getattr(klass, 'Meta')
         # Set klass.opts in __new__ rather than __init__ so that it is accessible in
         # get_declared_fields
-        klass.opts = klass.OPTIONS_CLASS(meta, ordered=ordered)
+        klass.opts = klass.OPTIONS_CLASS(meta)
+        # Pass the inherited `ordered` into opts
+        klass.opts.ordered = ordered
         # Add fields specifid in the `include` class Meta option
         cls_fields += list(klass.opts.include.items())
 
@@ -177,7 +179,7 @@ def _resolve_processors(self):
 class SchemaOpts(object):
     """class Meta options for the :class:`Schema`. Defines defaults."""
 
-    def __init__(self, meta, ordered=False):
+    def __init__(self, meta):
         self.fields = getattr(meta, 'fields', ())
         if not isinstance(self.fields, (list, tuple)):
             raise ValueError("`fields` option must be a list or tuple.")
@@ -199,7 +201,7 @@ def __init__(self, meta, ordered=False):
                 'Schema.dump will be excluded from the serialized output by default.',
                 UserWarning
             )
-        self.ordered = getattr(meta, 'ordered', ordered)
+        self.ordered = getattr(meta, 'ordered', False)
         self.index_errors = getattr(meta, 'index_errors', True)
         self.include = getattr(meta, 'include', {})
         self.load_only = getattr(meta, 'load_only', ())

tests/test_options.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from marshmallow import fields, Schema
+from marshmallow import fields, Schema, SchemaOpts
 from marshmallow.exceptions import ValidationError
 
 from tests.base import *  # noqa
@@ -228,3 +228,18 @@ class AddFieldsChild(self.AddFieldsSchema):
         assert 'email' in s._declared_fields.keys()
         assert 'from' in s._declared_fields.keys()
         assert isinstance(s._declared_fields['from'], fields.Str)
+
+
+class CustomSchemaOpts(SchemaOpts):
+    def __init__(self, meta):
+        super(CustomSchemaOpts, self).__init__(meta)
+        self.custom_option = True
+
+class SchemaWithCustomSchemaOpts(Schema):
+    OPTIONS_CLASS = CustomSchemaOpts
+
+class TestSchemaOptsClass:
+
+    def test_schema_with_custom_schema_opts(self):
+        s = SchemaWithCustomSchemaOpts()
+        assert s.opts.custom_option