[SQL-CVS] r3539 - SQLObject/trunk/sqlobject/manager
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2008-07-31 21:32:21
|
Author: phd Date: 2008-07-31 15:32:17 -0600 (Thu, 31 Jul 2008) New Revision: 3539 Modified: SQLObject/trunk/sqlobject/manager/command.py Log: Merged the revision 3537 from the branch 0.9: fixed a misspelling, removed trailing spaces. Modified: SQLObject/trunk/sqlobject/manager/command.py =================================================================== --- SQLObject/trunk/sqlobject/manager/command.py 2008-07-31 21:30:53 UTC (rev 3538) +++ SQLObject/trunk/sqlobject/manager/command.py 2008-07-31 21:32:17 UTC (rev 3539) @@ -1,12 +1,14 @@ #!/usr/bin/env python + +import fnmatch import optparse -import fnmatch +import os import re -import os import sys import textwrap +import time import warnings -import time + try: from paste.deploy import appconfig except ImportError: @@ -14,9 +16,9 @@ import sqlobject from sqlobject import col +from sqlobject.classregistry import findClass +from sqlobject.declarative import DeclarativeMeta from sqlobject.util import moduleloader -from sqlobject.declarative import DeclarativeMeta -from sqlobject.classregistry import findClass # It's not very unsafe to use tempnam like we are doing: warnings.filterwarnings( @@ -874,7 +876,7 @@ help = ('Record state of table definitions. The state of each ' 'table is written out to a separate file in a directory, ' 'and that directory forms a "version". A table is also ' - 'added to your datebase (%s) that reflects the version the ' + 'added to your database (%s) that reflects the version the ' 'database is currently at. Use the upgrade command to ' 'sync databases with code.' % SQLObjectVersionTable.sqlmeta.table) |