← Back to branch summary

~lifeless/storm/bug-620615

« back to all changes in this revision

Viewing changes to storm/info.py

Merging changes from James.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storm/info.py
24
24
from storm.expr import Expr, FromExpr, Column, Desc, TABLE
25
25
from storm.expr import SQLToken, CompileError, compile
26
26
from storm.event import EventSystem
27
 
from storm import Undef, psycer
 
27
from storm import Undef, psycer, _have_cextensions
28
28
 
29
29
 
30
30
__all__ = ["get_obj_info", "set_obj_info", "get_cls_info",
194
194
        for variable in self.variables.itervalues():
195
195
            variable.checkpoint()
196
196
 
197
 
try:
 
197
if _have_cextensions:
198
198
    from storm.cextensions import ObjectInfo, get_obj_info
199
 
except ImportError, e:
200
 
    if "cextensions" not in str(e):
201
 
        raise
202
199
 
203
200
 
204
201
class ClassAlias(FromExpr):