Skip to content

Commit

Permalink
Delete trailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
douglatornell committed Mar 18, 2013
1 parent ff6d8c2 commit 4a1776e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions colander/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1708,7 +1708,7 @@ def __init__(self, *arg, **kw):
_add_node_children(self, arg[1:])
else:
self.typ = self.schema_type()

# bw compat forces us to manufacture a title if one is not supplied
title = kw.get('title', _marker)
if title is _marker:
Expand Down Expand Up @@ -1999,7 +1999,7 @@ def __init__(cls, name, bases, clsattrs):
(_SchemaNode,),
{}
)

class Schema(SchemaNode):
schema_type = Mapping

Expand Down
18 changes: 9 additions & 9 deletions colander/tests/test_colander.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def test_it_success(self):
val = 'http://example.com'
result = self._callFUT(val)
self.assertEqual(result, None)

def test_it_failure(self):
val = 'not-a-url'
from colander import Invalid
Expand Down Expand Up @@ -727,7 +727,7 @@ def test_cstruct_children_cstruct_is_null(self):
node1.children = [node2]
result = typ.cstruct_children(node1, null)
self.assertEqual(result, [null])

def test_cstruct_children(self):
from colander import null
typ = self._makeOne()
Expand Down Expand Up @@ -959,7 +959,7 @@ def test_cstruct_children_cstruct_is_null(self):
node1.children = [node2]
result = typ.cstruct_children(node1, null)
self.assertEqual(result, [null])

def test_cstruct_children_toomany(self):
typ = self._makeOne()
node1 = DummySchemaNode(typ, name='node1')
Expand Down Expand Up @@ -1197,7 +1197,7 @@ def test_cstruct_children_cstruct_is_null(self):
typ = self._makeOne()
result = typ.cstruct_children(None, null)
self.assertEqual(result, SequenceItems([]))

def test_cstruct_children_cstruct_is_non_null(self):
from colander import SequenceItems
typ = self._makeOne()
Expand Down Expand Up @@ -2508,7 +2508,7 @@ class MyNode(colander.SchemaNode):
node = MyNode(missing=5)
result = node.deserialize(colander.null)
self.assertEqual(result, 5)

def test_method_values_can_rely_on_binding(self):
import colander
class MyNode(colander.SchemaNode):
Expand Down Expand Up @@ -2751,14 +2751,14 @@ class Two(One):
id='a2',
)
c = colander.SchemaNode(
colander.String(),
colander.String(),
id='c2',
)
e = colander.SchemaNode(
colander.String(),
id='e2',
)

class Three(Two):
b = colander.SchemaNode(
colander.Bool(),
Expand Down Expand Up @@ -2801,14 +2801,14 @@ class Two(colander.Schema):
id='a2',
)
c = colander.SchemaNode(
colander.String(),
colander.String(),
id='c2',
)
e = colander.SchemaNode(
colander.String(),
id='e2',
)

class Three(Two, One):
b = colander.SchemaNode(
colander.Bool(),
Expand Down

0 comments on commit 4a1776e

Please sign in to comment.