Author: phd
Date: 2008-07-31 15:30:53 -0600 (Thu, 31 Jul 2008)
New Revision: 3538
Modified:
SQLObject/branches/0.10/sqlobject/manager/command.py
Log:
Merged the revision 3537 from the branch 0.9:
fixed a misspelling, removed trailing spaces.
Modified: SQLObject/branches/0.10/sqlobject/manager/command.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/manager/command.py 2008-07-31 21:29:31 UTC (rev 3537)
+++ SQLObject/branches/0.10/sqlobject/manager/command.py 2008-07-31 21:30:53 UTC (rev 3538)
@@ -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(
@@ -193,7 +195,7 @@
# having to modify any core SQLObject component and namespace
# contamination.
# yemartin - 2006-08-08
-
+
class SQLObjectCircularReferenceError(Exception): pass
def findReverseDependencies(cls):
@@ -209,7 +211,7 @@
if other not in depended:
depended.append(other)
return depended
-
+
# Cache to save already calculated dependency levels.
dependency_levels = {}
def calculateDependencyLevel(cls, dependency_stack=[]):
@@ -237,7 +239,7 @@
level = 0
dependency_levels[cls] = level
return level
-
+
# Now simply calculate and sort by dependency levels:
try:
sorter = []
@@ -876,7 +878,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)
|