Remove last references to 'edbob' package

This commit is contained in:
Lance Edgar 2016-10-09 21:12:13 -05:00
parent 9b50067bd7
commit b157b79938
18 changed files with 126 additions and 72 deletions

View file

@ -1,9 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2012 Lance Edgar
# Copyright © 2010-2016 Lance Edgar
#
# This file is part of Rattail.
#
@ -21,12 +20,13 @@
# along with Rattail. If not, see <http://www.gnu.org/licenses/>.
#
################################################################################
"""
Grids
"""
from __future__ import unicode_literals, absolute_import
from .core import *
from .alchemy import *
from .alchemy import AlchemyGrid
from . import util
from . import search

View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2014 Lance Edgar
# Copyright © 2010-2016 Lance Edgar
#
# This file is part of Rattail.
#
@ -24,7 +24,7 @@
FormAlchemy Grid Classes
"""
from __future__ import unicode_literals
from __future__ import unicode_literals, absolute_import
from sqlalchemy.orm import object_session
@ -34,17 +34,14 @@ except ImportError:
inspect = None
from sqlalchemy.orm import class_mapper
from rattail.util import prettify
import formalchemy as fa
from webhelpers.html import tags
from webhelpers.html import HTML
import formalchemy
from edbob.util import prettify
from .core import Grid
from ..db import Session
__all__ = ['AlchemyGrid']
from tailbone.db import Session
from tailbone.grids.core import Grid
class AlchemyGrid(Grid):
@ -56,8 +53,8 @@ class AlchemyGrid(Grid):
def __init__(self, request, cls, instances, **kwargs):
super(AlchemyGrid, self).__init__(request, **kwargs)
self._formalchemy_grid = formalchemy.Grid(
cls, instances, session=Session(), request=request)
self._formalchemy_grid = fa.Grid(cls, instances, session=Session(),
request=request)
self._formalchemy_grid.prettify = prettify
def __delattr__(self, attr):

View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2015 Lance Edgar
# Copyright © 2010-2016 Lance Edgar
#
# This file is part of Rattail.
#
@ -24,7 +24,7 @@
Grid Search Filters
"""
from __future__ import unicode_literals
from __future__ import unicode_literals, absolute_import
import re
@ -37,10 +37,9 @@ from pyramid.renderers import render
from pyramid_simpleform import Form
from pyramid_simpleform.renderers import FormRenderer
from edbob.util import prettify
from rattail.core import Object
from rattail.gpc import GPC
from rattail.util import prettify
class SearchFilter(Object):