From 5f131b15efecadfe5829793341208364f1203da0 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 2 Mar 2018 21:10:24 +0100
Subject: [PATCH] Bye bye flask-peewee

---
 digimarks.py         | 28 +++++++++++++++++-----------
 requirements-dev.txt |  7 ++-----
 requirements.in      |  1 -
 requirements.txt     |  9 +++------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/digimarks.py b/digimarks.py
index 4794c46..4051f8b 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -6,6 +6,14 @@ import hashlib
 import os
 import shutil
 import sys
+
+import bs4
+import requests
+from flask import (Flask, abort, jsonify, redirect, render_template, request,
+                   url_for)
+from peewee import *  # noqa
+from werkzeug.contrib.atom import AtomFeed
+
 try:
     # Python 3
     from urllib.parse import urljoin, urlparse, urlunparse
@@ -13,13 +21,6 @@ except ImportError:
     # Python 2
     from urlparse import urljoin, urlparse, urlunparse
 
-import bs4
-import requests
-from flask import (Flask, abort, jsonify, redirect, render_template, request,
-                   url_for)
-from flask_peewee.db import Database
-from peewee import *  # noqa
-from werkzeug.contrib.atom import AtomFeed
 
 DEFAULT_THEME = 'green'
 themes = {
@@ -150,7 +151,7 @@ DATABASE = {
 # create our flask app and a database wrapper
 app = Flask(__name__)
 app.config.from_object(__name__)
-db = Database(app)
+database = SqliteDatabase(os.path.join(APP_ROOT, 'bookmarks.db'))
 
 # set custom url for the app, for example '/bookmarks'
 try:
@@ -215,7 +216,12 @@ def file_type(filename):
     return "no match"
 
 
-class User(db.Model):
+class BaseModel(Model):
+    class Meta:
+        database = database
+
+
+class User(BaseModel):
     """ User account """
     username = CharField()
     key = CharField()
@@ -228,7 +234,7 @@ class User(db.Model):
         return self.key
 
 
-class Bookmark(db.Model):
+class Bookmark(BaseModel):
     """ Bookmark instance, connected to User """
     # Foreign key to User
     userkey = CharField()
@@ -369,7 +375,7 @@ class Bookmark(db.Model):
         return result
 
 
-class PublicTag(db.Model):
+class PublicTag(BaseModel):
     """ Publicly shared tag """
     tagkey = CharField()
     userkey = CharField()
diff --git a/requirements-dev.txt b/requirements-dev.txt
index b61b174..a746300 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,12 +10,11 @@ bs4==0.0.1
 certifi==2018.1.18        # via requests
 chardet==3.0.4            # via requests
 click==6.7                # via flask
-flask-peewee==3.0.0
 flask==0.12.2
 idna==2.6                 # via requests
 isort==4.3.4              # via pylint
 itsdangerous==0.24        # via flask
-jinja2==2.10              # via flask, flask-peewee
+jinja2==2.10              # via flask
 lazy-object-proxy==1.3.1  # via astroid
 markupsafe==1.0           # via jinja2
 mccabe==0.6.1             # via pylint
@@ -24,7 +23,5 @@ pylint==1.8.2
 requests==2.18.4
 six==1.11.0               # via astroid, pylint
 urllib3==1.22             # via requests
-werkzeug==0.14.1          # via flask, flask-peewee
+werkzeug==0.14.1          # via flask
 wrapt==1.10.11            # via astroid
-wtf-peewee==3.0.0         # via flask-peewee
-wtforms==2.1              # via flask-peewee, wtf-peewee
diff --git a/requirements.in b/requirements.in
index 06d0238..509e468 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,5 +1,4 @@
 flask
 peewee
-flask-peewee
 bs4
 requests
diff --git a/requirements.txt b/requirements.txt
index af6ad8c..1904cd6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,15 +9,12 @@ bs4==0.0.1
 certifi==2018.1.18        # via requests
 chardet==3.0.4            # via requests
 click==6.7                # via flask
-flask-peewee==0.6.7
 flask==0.12.2
 idna==2.6                 # via requests
 itsdangerous==0.24        # via flask
-jinja2==2.10              # via flask, flask-peewee
+jinja2==2.10              # via flask
 markupsafe==1.0           # via jinja2
-peewee==2.10.2
+peewee==3.1.2
 requests==2.18.4
 urllib3==1.22             # via requests
-werkzeug==0.14.1          # via flask, flask-peewee
-wtf-peewee==0.2.6         # via flask-peewee
-wtforms==2.1              # via flask-peewee, wtf-peewee
+werkzeug==0.14.1          # via flask