diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-13 20:19:25 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-13 20:19:25 -0400 |
| commit | 598e2311bf19f765a0939b502efa62098e127236 (patch) | |
| tree | 65a7d1c676501ef17265aacd55dedb42741a58f0 /lib/sqlalchemy/ext/serializer.py | |
| parent | 071a1830985834efc113f63fa8740c7306e0cae3 (diff) | |
| parent | 28dd15081db4b7e978fa7a187c3aef1c0e4ad4e3 (diff) | |
| download | sqlalchemy-598e2311bf19f765a0939b502efa62098e127236.tar.gz | |
Merge branch 'pep8'
Diffstat (limited to 'lib/sqlalchemy/ext/serializer.py')
| -rw-r--r-- | lib/sqlalchemy/ext/serializer.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/sqlalchemy/ext/serializer.py b/lib/sqlalchemy/ext/serializer.py index 17c1ed30c..bf8d67d8e 100644 --- a/lib/sqlalchemy/ext/serializer.py +++ b/lib/sqlalchemy/ext/serializer.py @@ -22,7 +22,8 @@ Usage is nearly the same as that of the standard Python pickle module:: # ... define mappers - query = Session.query(MyClass).filter(MyClass.somedata=='foo').order_by(MyClass.sortkey) + query = Session.query(MyClass). + filter(MyClass.somedata=='foo').order_by(MyClass.sortkey) # pickle the query serialized = dumps(query) @@ -70,7 +71,7 @@ def Serializer(*args, **kw): pickler = pickle.Pickler(*args, **kw) def persistent_id(obj): - #print "serializing:", repr(obj) + # print "serializing:", repr(obj) if isinstance(obj, QueryableAttribute): cls = obj.impl.class_ key = obj.impl.key @@ -79,11 +80,12 @@ def Serializer(*args, **kw): id = "mapper:" + b64encode(pickle.dumps(obj.class_)) elif isinstance(obj, MapperProperty) and not obj.parent.non_primary: id = "mapperprop:" + b64encode(pickle.dumps(obj.parent.class_)) + \ - ":" + obj.key + ":" + obj.key elif isinstance(obj, Table): id = "table:" + text_type(obj.key) elif isinstance(obj, Column) and isinstance(obj.table, Table): - id = "column:" + text_type(obj.table.key) + ":" + text_type(obj.key) + id = "column:" + \ + text_type(obj.table.key) + ":" + text_type(obj.key) elif isinstance(obj, Session): id = "session:" elif isinstance(obj, Engine): @@ -96,7 +98,7 @@ def Serializer(*args, **kw): return pickler our_ids = re.compile( - r'(mapperprop|mapper|table|column|session|attribute|engine):(.*)') + r'(mapperprop|mapper|table|column|session|attribute|engine):(.*)') def Deserializer(file, metadata=None, scoped_session=None, engine=None): |