Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support latest packages #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ps_alchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Distributed under terms of the MIT license.
from pyramid.events import ApplicationCreated
from pyramid_sacrud.routes import resources_preparing_factory
from sqlalchemy.ext.declarative.api import DeclarativeMeta
from sqlalchemy.orm.decl_api import DeclarativeMeta

from .resources import ListResource

Expand Down
3 changes: 2 additions & 1 deletion ps_alchemy/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import json
import logging
from six import text_type
from html import escape

import deform
import colander
Expand All @@ -8,7 +10,6 @@
import transaction
from pyramid.view import view_config, view_defaults
from sacrud.common import pk_list_to_dict
from pyramid.compat import escape, text_type
from pyramid_sacrud import PYRAMID_SACRUD_VIEW
from pyramid.renderers import render_to_response
from sqlalchemy.orm.exc import NoResultFound
Expand Down