diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-26 13:13:13 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-26 13:13:13 -0700 |
| commit | 1caa7fafbd3c9870e1bf2b2ac623872447fc804e (patch) | |
| tree | 509f53bfba7c3bbc6941653b82c7cefcb819247c /test/orm/test_merge.py | |
| parent | 146fbf6d26a8c4140a47aeb03131fdf81007b9a2 (diff) | |
| download | sqlalchemy-pr/85.tar.gz | |
Fix many typos throughout the codebasepr/85
Found using: https://github.com/intgr/topy
Diffstat (limited to 'test/orm/test_merge.py')
| -rw-r--r-- | test/orm/test_merge.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py index 494f5e349..a52274896 100644 --- a/test/orm/test_merge.py +++ b/test/orm/test_merge.py @@ -748,7 +748,7 @@ class MergeTest(_fixtures.FixtureTest): 'converted' to represent the correct objects. However, at the moment I'd rather not support this use case; if you are merging with load=False, you're typically dealing with caching and the - merged objects shouldnt be 'dirty'. + merged objects shouldn't be 'dirty'. """ @@ -782,7 +782,7 @@ class MergeTest(_fixtures.FixtureTest): self.assert_sql_count(testing.db, go, 0) def test_no_load_disallows_dirty(self): - """load=False doesnt support 'dirty' objects right now + """load=False doesn't support 'dirty' objects right now (see test_no_load_with_eager()). Therefore lets assert it. @@ -899,7 +899,7 @@ class MergeTest(_fixtures.FixtureTest): 'somenewaddress') # this use case is not supported; this is with a pending Address - # on the pre-merged object, and we currently dont support + # on the pre-merged object, and we currently don't support # 'dirty' objects being merged with load=False. in this case, # the empty '_state.parents' collection would be an issue, since # the optimistic flag is False in _is_orphan() for pending |