correct typo-equivalent mistakes in some comments/docstrings

diff --git a/lib/sqlalchemy/ext/activemapper.py b/lib/sqlalchemy/ext/activemapper.py
index bcfbac63291578c0f103117123e8100f56678296..004caf84946038e4e31fe0532a366373981c5f47 100644 (file)
--- a/lib/sqlalchemy/ext/activemapper.py
+++ b/lib/sqlalchemy/ext/activemapper.py
@@ -271,11 +271,11 @@ class ActiveMapperMeta(type):
                 cls.table = Table(table_name, _metadata, autoload=True, **table_opts)
                 cls.columns = cls.table._columns
             
-            # check for inheritence
             if version_id_col is not None:
                 version_id_col_object = getattr(cls.table.c, version_id_col, None)
                 assert(version_id_col_object is not None, "version_id_col (%s) does not exist." % version_id_col)
 
+            # check for inheritence
             if hasattr(bases[0], "mapping"):
                 cls._base_mapper= bases[0].mapper
                 assign_mapper(objectstore.context, cls, cls.table, 

diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 358e1297f2e42eef165877b34e286276b6abcffb..a9a26b57f9bd38217818e62a8e7e26ea7c07d1d4 100644 (file)
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -72,6 +72,7 @@ class MapperProperty(object):
         """
 
         pass
+
     def is_primary(self):
         """Return True if this ``MapperProperty``'s mapper is the
         primary mapper for its class.
@@ -155,6 +156,7 @@ class StrategizedProperty(MapperProperty):
             return strategy
 
     def setup(self, querycontext, **kwargs):
+
         self._get_context_strategy(querycontext).setup_query(querycontext, **kwargs)
 
     def execute(self, selectcontext, instance, row, identitykey, isnew):

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 7d7dbeeedf4d51d01f961f0d861f65b9862781ad..ce642c1588f6f36892e70ec7be94490baa7a85ad 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -164,7 +164,7 @@ def adapt_type(typeobj, colspecs):
     # if we adapted the given generic type to a database-specific type,
     # but it turns out the originally given "generic" type
     # is actually a subclass of our resulting type, then we were already
-    # were given a more specific type than that required; so use that.
+    # given a more specific type than that required; so use that.
     if (issubclass(typeobj.__class__, impltype)):
         return typeobj
     return typeobj.adapt(impltype)

diff --git a/test/orm/mapper.py b/test/orm/mapper.py
index 405b14cff0d24e4679ebf8f3edd99a8224260306..08faf721f95b126197b060e4c49452acfab0783c 100644 (file)
--- a/test/orm/mapper.py
+++ b/test/orm/mapper.py
@@ -156,7 +156,7 @@ class MapperTest(MapperSuperTest):
             pass
 
     def testconstructorexceptions(self):
-        """test that exceptions raised raised in the mapped class are not masked by sa decorations""" 
+        """test that exceptions raised in the mapped class are not masked by sa decorations""" 
         ex = AssertionError('oops')
         sess = create_session()