Commit 50a0251b authored by Alex Kerney's avatar Alex Kerney

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

parent 222261a9
...@@ -51,4 +51,4 @@ MongoEngine ...@@ -51,4 +51,4 @@ MongoEngine
----------- -----------
1. Flask-Admin supports GridFS-backed image- and file uploads, done through WTForms fields. Documentation can be found 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`.
...@@ -5,7 +5,7 @@ from flask_admin.contrib import sqla ...@@ -5,7 +5,7 @@ from flask_admin.contrib import sqla
from flask_admin import expose, Admin from flask_admin import expose, Admin
# required for creating custom filters # 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 # Create application
app = Flask(__name__) app = Flask(__name__)
......
...@@ -12,11 +12,11 @@ from flask import flash, redirect, abort, request, send_file ...@@ -12,11 +12,11 @@ from flask import flash, redirect, abort, request, send_file
from wtforms import fields, validators from wtforms import fields, validators
from flask.ext.admin import form, helpers from flask_admin import form, helpers
from flask.ext.admin._compat import urljoin, as_unicode from flask_admin._compat import urljoin, as_unicode
from flask.ext.admin.base import BaseView, expose from flask_admin.base import BaseView, expose
from flask.ext.admin.actions import action, ActionsMixin from flask_admin.actions import action, ActionsMixin
from flask.ext.admin.babel import gettext, lazy_gettext from flask_admin.babel import gettext, lazy_gettext
class FileAdmin(BaseView, ActionsMixin): class FileAdmin(BaseView, ActionsMixin):
......
...@@ -27,7 +27,7 @@ class ModelView(BaseModelView): ...@@ -27,7 +27,7 @@ class ModelView(BaseModelView):
Collection of the column filters. Collection of the column filters.
Can contain either field names or instances of 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:: For example::
......
def setup(): def setup():
import warnings 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 from flask_admin._backwards import import_redirect
import_redirect(__name__, 'flask_admin.contrib.peewee') import_redirect(__name__, 'flask_admin.contrib.peewee')
......
...@@ -2,7 +2,7 @@ def setup(): ...@@ -2,7 +2,7 @@ def setup():
import warnings import warnings
warnings.warn('Flask-Admin sqlalchemy integration module was renamed as flask_admin.contrib.sqla, please use it instead.') 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') import_redirect(__name__, 'flask_admin.contrib.sqla')
setup() setup()
......
from jinja2 import Markup from jinja2 import Markup
from flask.ext.admin._compat import string_types from flask_admin._compat import string_types
from flask.ext.admin import helpers from flask_admin import helpers
class BaseRule(object): class BaseRule(object):
......
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
def setup(): def setup():
......
...@@ -2,7 +2,7 @@ import os.path as op ...@@ -2,7 +2,7 @@ import os.path as op
from nose.tools import eq_, ok_ from nose.tools import eq_, ok_
from flask.ext.admin.contrib import fileadmin from flask_admin.contrib import fileadmin
from . import setup from . import setup
......
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
from flask.ext.sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
def setup(): def setup():
......
from __future__ import unicode_literals from __future__ import unicode_literals
from nose.tools import eq_, ok_ 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 import Geometry
from geoalchemy2.shape import to_shape 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 from . import setup
......
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
from flask.ext.mongoengine import MongoEngine from flask_mongoengine import MongoEngine
def setup(): def setup():
......
...@@ -2,14 +2,14 @@ from nose.tools import eq_, ok_ ...@@ -2,14 +2,14 @@ from nose.tools import eq_, ok_
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
# Skip test on PY3 # Skip test on PY3
from flask.ext.admin._compat import PY2, as_unicode from flask_admin._compat import PY2, as_unicode
if not PY2: if not PY2:
raise SkipTest('MongoEngine is not Python 3 compatible') raise SkipTest('MongoEngine is not Python 3 compatible')
from wtforms import fields from wtforms import fields
from flask.ext.admin import form from flask_admin import form
from flask.ext.admin.contrib.mongoengine import ModelView from flask_admin.contrib.mongoengine import ModelView
from . import setup from . import setup
...@@ -698,7 +698,7 @@ def test_subdocument_config(): ...@@ -698,7 +698,7 @@ def test_subdocument_config():
def test_subdocument_class_config(): def test_subdocument_class_config():
app, db, admin = setup() app, db, admin = setup()
from flask.ext.admin.contrib.mongoengine import EmbeddedForm from flask_admin.contrib.mongoengine import EmbeddedForm
class Comment(db.EmbeddedDocument): class Comment(db.EmbeddedDocument):
name = db.StringField(max_length=20, required=True) name = db.StringField(max_length=20, required=True)
......
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
import peewee import peewee
......
...@@ -2,7 +2,7 @@ from nose.tools import eq_, ok_ ...@@ -2,7 +2,7 @@ from nose.tools import eq_, ok_
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
# Skip test on PY3 # Skip test on PY3
from flask.ext.admin._compat import PY2, as_unicode from flask_admin._compat import PY2, as_unicode
if not PY2: if not PY2:
raise SkipTest('Peewee is not Python 3 compatible') raise SkipTest('Peewee is not Python 3 compatible')
...@@ -10,9 +10,9 @@ import peewee ...@@ -10,9 +10,9 @@ import peewee
from wtforms import fields from wtforms import fields
from flask.ext.admin import form from flask_admin import form
from flask.ext.admin._compat import iteritems from flask_admin._compat import iteritems
from flask.ext.admin.contrib.peewee import ModelView from flask_admin.contrib.peewee import ModelView
from . import setup from . import setup
......
import pymongo import pymongo
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
def setup(): def setup():
......
...@@ -2,7 +2,7 @@ from nose.tools import eq_, ok_ ...@@ -2,7 +2,7 @@ from nose.tools import eq_, ok_
from wtforms import form, fields from wtforms import form, fields
from flask.ext.admin.contrib.pymongo import ModelView from flask_admin.contrib.pymongo import ModelView
from . import setup from . import setup
......
from flask import Flask from flask import Flask
from flask.ext.admin import Admin from flask_admin import Admin
from flask.ext.sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
def setup(): def setup():
......
...@@ -2,11 +2,11 @@ from nose.tools import eq_, ok_, raises ...@@ -2,11 +2,11 @@ from nose.tools import eq_, ok_, raises
from wtforms import fields from wtforms import fields
from flask.ext.admin import form from flask_admin import form
from flask.ext.admin._compat import as_unicode from flask_admin._compat import as_unicode
from flask.ext.admin._compat import iteritems from flask_admin._compat import iteritems
from flask.ext.admin.contrib.sqla import ModelView, filters from flask_admin.contrib.sqla import ModelView, filters
from flask.ext.babelex import Babel from flask_babel import Babel
from . import setup from . import setup
......
...@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_, raises ...@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_, raises
from . import setup from . import setup
from .test_basic import CustomModelView, create_models from .test_basic import CustomModelView, create_models
from flask.ext.admin.form import rules from flask_admin.form import rules
def test_form_rules(): def test_form_rules():
......
...@@ -3,9 +3,9 @@ from nose.tools import eq_, ok_, raises ...@@ -3,9 +3,9 @@ from nose.tools import eq_, ok_, raises
from wtforms import fields from wtforms import fields
from flask.ext.admin.contrib.sqla import ModelView from flask_admin.contrib.sqla import ModelView
from flask.ext.admin.contrib.sqla.fields import InlineModelFormList from flask_admin.contrib.sqla.fields import InlineModelFormList
from flask.ext.admin.contrib.sqla.validators import ItemsRequired from flask_admin.contrib.sqla.validators import ItemsRequired
from . import setup from . import setup
......
...@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_ ...@@ -3,7 +3,7 @@ from nose.tools import eq_, ok_
from . import setup from . import setup
from .test_basic import CustomModelView from .test_basic import CustomModelView
from flask.ext.sqlalchemy import Model from flask_sqlalchemy import Model
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
......
...@@ -2,7 +2,7 @@ from nose.tools import ok_, eq_, raises ...@@ -2,7 +2,7 @@ from nose.tools import ok_, eq_, raises
from flask import Flask, request, abort, url_for from flask import Flask, request, abort, url_for
from flask.views import MethodView from flask.views import MethodView
from flask.ext.admin import base from flask_admin import base
class MockView(base.BaseView): class MockView(base.BaseView):
......
...@@ -6,7 +6,7 @@ from io import BytesIO ...@@ -6,7 +6,7 @@ from io import BytesIO
from nose.tools import eq_, ok_ from nose.tools import eq_, ok_
from flask import Flask, url_for from flask import Flask, url_for
from flask.ext.admin import form, helpers from flask_admin import form, helpers
def _create_temp(): def _create_temp():
......
...@@ -9,9 +9,9 @@ from werkzeug.test import Client ...@@ -9,9 +9,9 @@ from werkzeug.test import Client
from wtforms import fields from wtforms import fields
from flask.ext.admin import Admin, form from flask_admin import Admin, form
from flask.ext.admin._compat import iteritems, itervalues from flask_admin._compat import iteritems, itervalues
from flask.ext.admin.model import base, filters from flask_admin.model import base, filters
def wtforms2_and_up(func): def wtforms2_and_up(func):
......
from nose.tools import eq_, ok_ from nose.tools import eq_, ok_
from flask.ext.admin import tools from flask_admin import tools
def test_encode_decode(): def test_encode_decode():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment