1
0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-06 22:05:09 +01:00

Merge pull request #2 from jelmer/utilkit

Drop dependency on utilkit.
This commit is contained in:
Michiel Scholten
2016-12-29 20:48:42 +01:00
committed by GitHub
3 changed files with 2 additions and 5 deletions

View File

@@ -9,8 +9,6 @@ import shutil
import bs4 import bs4
from urlparse import urlparse, urlunparse, urljoin from urlparse import urlparse, urlunparse, urljoin
from utilkit import datetimeutil
from flask import Flask, abort, redirect, render_template, request, url_for, jsonify from flask import Flask, abort, redirect, render_template, request, url_for, jsonify
from werkzeug.contrib.atom import AtomFeed from werkzeug.contrib.atom import AtomFeed
from flask_peewee.db import Database from flask_peewee.db import Database
@@ -248,7 +246,7 @@ class Bookmark(db.Model):
result = { result = {
'title': self.title, 'title': self.title,
'url': self.url, 'url': self.url,
'created': datetimeutil.datetime_to_string(self.created_date), 'created': self.created_date.strftime('%Y-%m-%d %H:%M:%S'),
'url_hash': self.url_hash, 'url_hash': self.url_hash,
'tags': self.tags, 'tags': self.tags,
} }

View File

@@ -3,4 +3,3 @@ peewee
flask-peewee flask-peewee
bs4 bs4
requests requests
utilkit

View File

@@ -35,7 +35,7 @@ setup(
# as a practice no need to hard code version unless you know program wont # as a practice no need to hard code version unless you know program wont
# work unless the specific versions are used # work unless the specific versions are used
install_requires=['Flask', 'Peewee', 'Flask-Peewee', 'requests', 'utilkit'], install_requires=['Flask', 'Peewee', 'Flask-Peewee', 'requests'],
py_modules=['digimarks'], py_modules=['digimarks'],