Updated naming for tests and a few files that I missed on the first pass.

doc/tips.rst

@@ -51,4 +51,4 @@ MongoEngine
 -----------
 
 1. Flask-Admin supports GridFS-backed image- and file uploads, done through WTForms fields. Documentation can be found
-   at :mod:`flask.ext.admin.contrib.mongoengine.fields`.
+   at :mod:`flask_admin.contrib.mongoengine.fields`.

examples/sqla-custom-filter/app.py

@@ -5,7 +5,7 @@ from flask_admin.contrib import sqla
 from flask_admin import expose, Admin
 
 # required for creating custom filters
-from flask.ext.admin.contrib.sqla.filters import BaseSQLAFilter, FilterEqual
+from flask_admin.contrib.sqla.filters import BaseSQLAFilter, FilterEqual
 
 # Create application
 app = Flask(__name__)

flask_admin/contrib/fileadmin.py

@@ -12,11 +12,11 @@ from flask import flash, redirect, abort, request, send_file
 
 from wtforms import fields, validators
 
-from flask.ext.admin import form, helpers
-from flask.ext.admin._compat import urljoin, as_unicode
-from flask.ext.admin.base import BaseView, expose
-from flask.ext.admin.actions import action, ActionsMixin
-from flask.ext.admin.babel import gettext, lazy_gettext
+from flask_admin import form, helpers
+from flask_admin._compat import urljoin, as_unicode
+from flask_admin.base import BaseView, expose
+from flask_admin.actions import action, ActionsMixin
+from flask_admin.babel import gettext, lazy_gettext
 
 
 class FileAdmin(BaseView, ActionsMixin):

flask_admin/contrib/peewee/view.py

@@ -27,7 +27,7 @@ class ModelView(BaseModelView):
         Collection of the column filters.
 
         Can contain either field names or instances of
-        :class:`flask.ext.admin.contrib.peewee.filters.BaseFilter` classes.
+        :class:`flask_admin.contrib.peewee.filters.BaseFilter` classes.
 
         For example::
 

flask_admin/contrib/peeweemodel/__init__.py

 def setup():
     import warnings
-    warnings.warn('Flask-Admin peewee integration module was renamed as flask.ext.admin.contrib.peewee, please use it instead.')
+    warnings.warn('Flask-Admin peewee integration module was renamed as flask_admin.contrib.peewee, please use it instead.')
 
     from flask_admin._backwards import import_redirect
     import_redirect(__name__, 'flask_admin.contrib.peewee')

flask_admin/contrib/sqlamodel/__init__.py

@@ -2,7 +2,7 @@ def setup():
     import warnings
     warnings.warn('Flask-Admin sqlalchemy integration module was renamed as flask_admin.contrib.sqla, please use it instead.')
 
-    from flask.ext.admin._backwards import import_redirect
+    from flask_admin._backwards import import_redirect
     import_redirect(__name__, 'flask_admin.contrib.sqla')
 
 setup()

flask_admin/form/rules.py

 from jinja2 import Markup
 
-from flask.ext.admin._compat import string_types
-from flask.ext.admin import helpers
+from flask_admin._compat import string_types
+from flask_admin import helpers
 
 
 class BaseRule(object):

flask_admin/tests/fileadmin/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
+from flask_admin import Admin
 
 
 def setup():

flask_admin/tests/fileadmin/test_fileadmin.py

@@ -2,7 +2,7 @@ import os.path as op
 
 from nose.tools import eq_, ok_
 
-from flask.ext.admin.contrib import fileadmin
+from flask_admin.contrib import fileadmin
 
 from . import setup
 

flask_admin/tests/geoa/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_admin import Admin
+from flask_sqlalchemy import SQLAlchemy
 
 
 def setup():

flask_admin/tests/geoa/test_basic.py

 from __future__ import unicode_literals
 from nose.tools import eq_, ok_
 
-from flask.ext.admin.contrib.geoa import ModelView
+from flask_admin.contrib.geoa import ModelView
 from geoalchemy2 import Geometry
 from geoalchemy2.shape import to_shape
-from flask.ext.admin.contrib.geoa.fields import GeoJSONField
+from flask_admin.contrib.geoa.fields import GeoJSONField
 
 from . import setup
 

flask_admin/tests/mongoengine/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
-from flask.ext.mongoengine import MongoEngine
+from flask_admin import Admin
+from flask_mongoengine import MongoEngine
 
 
 def setup():

flask_admin/tests/peeweemodel/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
+from flask_admin import Admin
 import peewee
 
 

flask_admin/tests/pymongo/__init__.py

 import pymongo
 
 from flask import Flask
-from flask.ext.admin import Admin
+from flask_admin import Admin
 
 
 def setup():

flask_admin/tests/pymongo/test_basic.py

@@ -2,7 +2,7 @@ from nose.tools import eq_, ok_
 
 from wtforms import form, fields
 
-from flask.ext.admin.contrib.pymongo import ModelView
+from flask_admin.contrib.pymongo import ModelView
 
 from . import setup
 

flask_admin/tests/sqla/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_admin import Admin
+from flask_sqlalchemy import SQLAlchemy
 
 
 def setup():

flask_admin/tests/sqla/test_form_rules.py

@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_, raises
 from . import setup
 from .test_basic import CustomModelView, create_models
 
-from flask.ext.admin.form import rules
+from flask_admin.form import rules
 
 
 def test_form_rules():

flask_admin/tests/sqla/test_inlineform.py

@@ -3,9 +3,9 @@ from nose.tools import eq_, ok_, raises
 
 from wtforms import fields
 
-from flask.ext.admin.contrib.sqla import ModelView
-from flask.ext.admin.contrib.sqla.fields import InlineModelFormList
-from flask.ext.admin.contrib.sqla.validators import ItemsRequired
+from flask_admin.contrib.sqla import ModelView
+from flask_admin.contrib.sqla.fields import InlineModelFormList
+from flask_admin.contrib.sqla.validators import ItemsRequired
 
 from . import setup
 

flask_admin/tests/sqla/test_multi_pk.py

@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_
 from . import setup
 from .test_basic import CustomModelView
 
-from flask.ext.sqlalchemy import Model
+from flask_sqlalchemy import Model
 from sqlalchemy.ext.declarative import declarative_base
 
 

flask_admin/tests/test_base.py

@@ -2,7 +2,7 @@ from nose.tools import ok_, eq_, raises
 
 from flask import Flask, request, abort, url_for
 from flask.views import MethodView
-from flask.ext.admin import base
+from flask_admin import base
 
 
 class MockView(base.BaseView):
@@ -132,11 +132,11 @@ def test_admin_customizations():
     client = app.test_client()
     rv = client.get('/foobar/')
     eq_(rv.status_code, 200)
-    
+
     # test custom static_url_path
     with app.test_request_context('/'):
         rv = client.get(url_for('admin.static', filename='bootstrap/bootstrap2/css/bootstrap.css'))
-    eq_(rv.status_code, 200)    
+    eq_(rv.status_code, 200)
 
 
 def test_baseview_registration():
@@ -364,7 +364,7 @@ def test_root_mount():
     client = app.test_client()
     rv = client.get('/mockview/')
     eq_(rv.data, b'Success!')
-    
+
     # test static files when url='/'
     with app.test_request_context('/'):
         rv = client.get(url_for('admin.static', filename='bootstrap/bootstrap2/css/bootstrap.css'))

flask_admin/tests/test_form_upload.py

@@ -6,7 +6,7 @@ from io import BytesIO
 from nose.tools import eq_, ok_
 
 from flask import Flask, url_for
-from flask.ext.admin import form, helpers
+from flask_admin import form, helpers
 
 
 def _create_temp():

flask_admin/tests/test_model.py

@@ -9,9 +9,9 @@ from werkzeug.test import Client
 
 from wtforms import fields
 
-from flask.ext.admin import Admin, form
-from flask.ext.admin._compat import iteritems, itervalues
-from flask.ext.admin.model import base, filters
+from flask_admin import Admin, form
+from flask_admin._compat import iteritems, itervalues
+from flask_admin.model import base, filters
 
 
 def wtforms2_and_up(func):
@@ -404,7 +404,7 @@ def test_csrf():
     csrf_token = get_csrf_token(rv.data.decode('utf-8'))
 
     # Edit without CSRF token
-    rv = client.post('/admin/secure/edit/?url=%2Fadmin%2Fsecure%2F&id=1', 
+    rv = client.post('/admin/secure/edit/?url=%2Fadmin%2Fsecure%2F&id=1',
                      data=dict(name='test1'))
     eq_(rv.status_code, 200)
 
@@ -423,7 +423,7 @@ def test_csrf():
     csrf_token = get_csrf_token(rv.data.decode('utf-8'))
 
     # Delete without CSRF token, test validation errors
-    rv = client.post('/admin/secure/delete/', 
+    rv = client.post('/admin/secure/delete/',
                      data=dict(id="1", url="/admin/secure/"), follow_redirects=True)
     eq_(rv.status_code, 200)
     ok_(u'Record was successfully deleted.' not in rv.data.decode('utf-8'))

flask_admin/tests/test_tools.py

 from nose.tools import eq_, ok_
 
-from flask.ext.admin import tools
+from flask_admin import tools
 
 
 def test_encode_decode():