diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-07 10:19:58 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-07 10:19:58 +0200 |
| commit | c87817488673385b7f9d78020d22788c5f1d9f7d (patch) | |
| tree | cc1933cd489d6c2432bb679e698dc8b4edf1edd0 /pyaggr3g470r/models | |
| parent | Released version 6.5. (diff) | |
| parent | correcting the way we use the controllers and adding documentation (diff) | |
| download | newspipe-c87817488673385b7f9d78020d22788c5f1d9f7d.tar.gz newspipe-c87817488673385b7f9d78020d22788c5f1d9f7d.tar.bz2 newspipe-c87817488673385b7f9d78020d22788c5f1d9f7d.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #7)
improving http crawler and misc correction on controller use
Diffstat (limited to 'pyaggr3g470r/models')
| -rw-r--r-- | pyaggr3g470r/models/article.py | 4 | ||||
| -rw-r--r-- | pyaggr3g470r/models/feed.py | 4 | ||||
| -rw-r--r-- | pyaggr3g470r/models/role.py | 4 | ||||
| -rw-r--r-- | pyaggr3g470r/models/user.py | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/pyaggr3g470r/models/article.py b/pyaggr3g470r/models/article.py index f026984a..58cd0384 100644 --- a/pyaggr3g470r/models/article.py +++ b/pyaggr3g470r/models/article.py @@ -27,12 +27,10 @@ __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" import json +from bootstrap import db from datetime import datetime -from flask import g from sqlalchemy import asc, desc -db = g.db - class Article(db.Model): """ diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py index ccc8094f..a36d9573 100644 --- a/pyaggr3g470r/models/feed.py +++ b/pyaggr3g470r/models/feed.py @@ -26,12 +26,10 @@ __revision__ = "$Date: 2014/04/12 $" __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" +from bootstrap import db from datetime import datetime -from flask import g from sqlalchemy import desc -db = g.db - class Feed(db.Model): """ diff --git a/pyaggr3g470r/models/role.py b/pyaggr3g470r/models/role.py index 71497caf..f5a18fdc 100644 --- a/pyaggr3g470r/models/role.py +++ b/pyaggr3g470r/models/role.py @@ -26,9 +26,7 @@ __revision__ = "$Date: 2014/04/12 $" __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" -from flask import g - -db = g.db +from bootstrap import db class Role(db.Model): diff --git a/pyaggr3g470r/models/user.py b/pyaggr3g470r/models/user.py index f2a268db..0bf9fe04 100644 --- a/pyaggr3g470r/models/user.py +++ b/pyaggr3g470r/models/user.py @@ -30,11 +30,10 @@ import re import random import hashlib from datetime import datetime -from flask import g from werkzeug import generate_password_hash, check_password_hash from flask.ext.login import UserMixin -db = g.db +from bootstrap import db class User(db.Model, UserMixin): |