summaryrefslogtreecommitdiff
path: root/docs/quick_tour/sqla_demo
diff options
context:
space:
mode:
authorAmos Latteier <amos@latteier.com>2016-06-30 10:17:43 -0700
committerAmos Latteier <amos@latteier.com>2016-06-30 10:17:43 -0700
commit35209e4ac53520e1159bd8a6b47128f38a75db18 (patch)
tree85b0f7e8e3794d8980dd10c10b7e57a862e694aa /docs/quick_tour/sqla_demo
parent3fd41dcb5a94a73f43862f6d5c063af7b54e6ff3 (diff)
parentbcba92d1b23745d736bdcbc9b799929de382db7b (diff)
downloadpyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.gz
pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.bz2
pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.zip
Merge branch 'master' into exception_only
Diffstat (limited to 'docs/quick_tour/sqla_demo')
-rw-r--r--docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py b/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py
index 6ffc10a78..76e0fd26b 100644
--- a/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py
+++ b/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py
@@ -1,7 +1,7 @@
from sqlalchemy.orm import configure_mappers
# import all models classes here for sqlalchemy mappers
# to pick up
-from .mymodel import MyModel # flake8: noqa
+from .mymodel import MyModel # noqa
# run configure mappers to ensure we avoid any race conditions
configure_mappers()