From: NickKush <nickush42@gmail.com>
Date: Wed, 21 Apr 2021 21:14:28 +0000 (+0300)
Subject: Fixed deprecated imports in orm/extensions docs
X-Git-Tag: rel_1_4_12~32^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F6341%2Fhead;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixed deprecated imports in orm/extensions docs
---

diff --git a/doc/build/orm/extensions/associationproxy.rst b/doc/build/orm/extensions/associationproxy.rst
index e976006c4c..640810117a 100644
--- a/doc/build/orm/extensions/associationproxy.rst
+++ b/doc/build/orm/extensions/associationproxy.rst
@@ -24,8 +24,7 @@ Each ``User`` can have any number of ``Keyword`` objects, and vice-versa
 (the many-to-many pattern is described at :ref:`relationships_many_to_many`)::
 
     from sqlalchemy import Column, Integer, String, ForeignKey, Table
-    from sqlalchemy.orm import relationship
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.orm import declarative_base, relationship
 
     Base = declarative_base()
 
@@ -167,10 +166,8 @@ collection of ``User`` to the ``.keyword`` attribute present on each
 ``UserKeyword``::
 
     from sqlalchemy import Column, Integer, String, ForeignKey
-    from sqlalchemy.orm import relationship, backref
-
     from sqlalchemy.ext.associationproxy import association_proxy
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.orm import backref, declarative_base, relationship
 
     Base = declarative_base()
 
@@ -277,9 +274,8 @@ argument to the ``User.keywords`` proxy so that these values are assigned approp
 when new elements are added to the dictionary::
 
     from sqlalchemy import Column, Integer, String, ForeignKey
-    from sqlalchemy.orm import relationship, backref
     from sqlalchemy.ext.associationproxy import association_proxy
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.orm import backref, declarative_base, relationship    
     from sqlalchemy.orm.collections import attribute_mapped_collection
 
     Base = declarative_base()
@@ -353,10 +349,8 @@ an association proxy on ``User`` that refers to an association proxy
 present on ``UserKeyword``::
 
     from sqlalchemy import Column, Integer, String, ForeignKey
-    from sqlalchemy.orm import relationship, backref
-
     from sqlalchemy.ext.associationproxy import association_proxy
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.orm import backref, declarative_base, relationship 
     from sqlalchemy.orm.collections import attribute_mapped_collection
 
     Base = declarative_base()
diff --git a/doc/build/orm/extensions/asyncio.rst b/doc/build/orm/extensions/asyncio.rst
index 2d3002c6dd..e56c4b59ac 100644
--- a/doc/build/orm/extensions/asyncio.rst
+++ b/doc/build/orm/extensions/asyncio.rst
@@ -100,9 +100,9 @@ illustrates a complete example including mapper and session configuration::
     from sqlalchemy import Integer
     from sqlalchemy import String
     from sqlalchemy.ext.asyncio import AsyncSession
-    from sqlalchemy.ext.asyncio import create_async_engine
-    from sqlalchemy.ext.declarative import declarative_base
+    from sqlalchemy.ext.asyncio import create_async_engine    
     from sqlalchemy.future import select
+    from sqlalchemy.orm import declarative_base
     from sqlalchemy.orm import relationship
     from sqlalchemy.orm import selectinload
     from sqlalchemy.orm import sessionmaker