Merge pull request pallets-eco#321 from ThiefMaster/no-flask-ext

davidism · davidism · commit f5d367e24f3f · 2015-12-03T05:02:37.000-08:00
Replace flask.ext.sqlalchemy with flask_sqlalchemy
diff --git a/docs/api.rst b/docs/api.rst
@@ -1,7 +1,7 @@
 API
 ---
 
-.. module:: flask.ext.sqlalchemy
+.. module:: flask_sqlalchemy
 
 This part of the documentation documents all the public classes and
 functions in Flask-SQLAlchemy.
diff --git a/docs/binds.rst b/docs/binds.rst
@@ -1,6 +1,6 @@
 .. _binds:
 
-.. currentmodule:: flask.ext.sqlalchemy
+.. currentmodule:: flask_sqlalchemy
 
 Multiple Databases with Binds
 =============================
diff --git a/docs/config.rst b/docs/config.rst
@@ -129,7 +129,7 @@ custom naming convention like this as suggested by the SQLAlchemy docs::
 
     from sqlalchemy import MetaData
     from flask import Flask
-    from flask.ext.sqlalchemy import SQLAlchemy
+    from flask_sqlalchemy import SQLAlchemy
 
     convention = {
         "ix": 'ix_%(column_0_label)s',
diff --git a/docs/contexts.rst b/docs/contexts.rst
@@ -1,6 +1,6 @@
 .. _contexts:
 
-.. currentmodule:: flask.ext.sqlalchemy
+.. currentmodule:: flask_sqlalchemy
 
 Introduction into Contexts
 ==========================
diff --git a/docs/index.rst b/docs/index.rst
@@ -3,7 +3,7 @@
 Flask-SQLAlchemy
 ================
 
-.. module:: flask.ext.sqlalchemy
+.. module:: flask_sqlalchemy
 
 Flask-SQLAlchemy is an extension for `Flask`_ that adds support for
 `SQLAlchemy`_ to your application.  It requires SQLAlchemy 0.6 or
diff --git a/docs/models.rst b/docs/models.rst
@@ -1,6 +1,6 @@
 .. _models:
 
-.. currentmodule:: flask.ext.sqlalchemy
+.. currentmodule:: flask_sqlalchemy
 
 Declaring Models
 ================
diff --git a/docs/queries.rst b/docs/queries.rst
@@ -1,4 +1,4 @@
-.. currentmodule:: flask.ext.sqlalchemy
+.. currentmodule:: flask_sqlalchemy
 
 Select, Insert, Delete
 ======================
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -3,7 +3,7 @@
 Quickstart
 ==========
 
-.. currentmodule:: flask.ext.sqlalchemy
+.. currentmodule:: flask_sqlalchemy
 
 Flask-SQLAlchemy is fun to use, incredibly easy for basic applications, and
 readily extends for larger applications.  For the complete guide, checkout

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.. currentmodule:: flask.ext.sqlalchemy`
	`1`	`+.. currentmodule:: flask_sqlalchemy`
`2`	`2`
`3`	`3`	`Select, Insert, Delete`
`4`	`4`	`======================`