~jbaker/storm/nose_plugin

« back to all changes in this revision

Viewing changes to storm/store.py

  • Committer: Jamu Kakar
  • Date: 2009-11-24 18:34:34 UTC
  • mfrom: (340 storm.trunk)
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: jkakar@kakar.ca-20091124183434-ambkvw9tp2byvjnc
- Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1206
1206
        value = result.get_one()[0]
1207
1207
        variable_factory = getattr(column, "variable_factory", None)
1208
1208
        if variable_factory:
1209
 
            variable = variable_factory()
 
1209
            variable = variable_factory(allow_none=True)
1210
1210
            result.set_variable(variable, value)
1211
1211
            return variable.get()
1212
1212
        return value