diana avatar diana committed 309e36c

typos in lib/sqlalchemy/orm

Comments (0)

Files changed (2)

lib/sqlalchemy/orm/__init__.py

 
       * True - a synonym for 'select'
 
-      * False - a synonyn for 'joined'
+      * False - a synonym for 'joined'
 
       * None - a synonym for 'noload'
 
 def composite(class_, *cols, **kwargs):
     """Return a composite column-based property for use with a Mapper.
 
-    See the mapping documention section :ref:`mapper_composite` for a full
+    See the mapping documentation section :ref:`mapper_composite` for a full
     usage example.
 
     :param class\_:
       Optional when used in a ``properties={}`` declaration.  The Python
       descriptor or property to layer comparison behavior on top of.
 
-      The like-named descriptor will be automatically retreived from the
+      The like-named descriptor will be automatically retrieved from the
       mapped class if left blank in a ``properties`` declaration.
 
     """
 
     examples::
 
-        # joined-load the "orders" colleciton on "User"
+        # joined-load the "orders" collection on "User"
         query(User).options(joinedload(User.orders))
 
         # joined-load the "keywords" collection on each "Item",
 
     examples::
 
-        # subquery-load the "orders" colleciton on "User"
+        # subquery-load the "orders" collection on "User"
         query(User).options(subqueryload(User.orders))
 
         # subquery-load the "keywords" collection on each "Item",

lib/sqlalchemy/orm/attributes.py

         Only applies to object-based attributes.
 
         This is an inlining of existing functionality
-        which roughly correponds to:
+        which roughly corresponds to:
 
             get_state_history(
                         state, 
              old is not PASSIVE_NO_RESULT and \
              check_old is not old:
             if pop:
-                 return
+                return
             else:
                 raise ValueError(
                     "Object %s not associated with %s on attribute '%s'" % (
                 return cls((), (), ())
             else:
                 return cls((), [current], ())
-        # dont let ClauseElement expressions here trip things up
+        # don't let ClauseElement expressions here trip things up
         elif attribute.is_equal(current, original) is True:
             return cls((), [current], ())
         else:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.