~fluiddb-dev/storm/trunk

« back to all changes in this revision

Viewing changes to storm/locals.py

  • Committer: Jamu Kakar
  • Date: 2011-02-28 21:25:44 UTC
  • mfrom: (386.1.2 json-property)
  • Revision ID: jkakar@kakar.ca-20110228212544-rm0wpjhqzi3i09fs
- Merged json-property.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
# You should have received a copy of the GNU Lesser General Public License
19
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
20
#
21
 
from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode, Pickle
 
21
 
 
22
from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode
22
23
from storm.properties import List, Decimal, DateTime, Date, Time, Enum, UUID
23
 
from storm.properties import TimeDelta
 
24
from storm.properties import TimeDelta, Pickle, JSON
24
25
from storm.references import Reference, ReferenceSet, Proxy
25
26
from storm.database import create_database
26
27
from storm.exceptions import StormError