~ubuntu-branches/debian/jessie/sqlalchemy/jessie

« back to all changes in this revision

Viewing changes to lib/sqlalchemy/orm/state.py

  • Committer: Bazaar Package Importer
  • Author(s): Piotr Ożarowski
  • Date: 2010-07-18 10:16:17 UTC
  • mfrom: (1.5.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100718101617-63m6de864oav9fsw
Tags: 0.6.3-1
* New upstream release
* Add ${python:Breaks} in debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
163
163
                        "Cannot deserialize object of type %r - no mapper() has"
164
164
                        " been configured for this class within the current Python process!" %
165
165
                        self.class_)
166
 
        elif manager.mapper and not manager.mapper.compiled:
 
166
        elif manager.is_mapped and not manager.mapper.compiled:
167
167
            manager.mapper.compile()
168
168
            
169
169
        self.committed_state = state.get('committed_state', {})