aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/utils.py
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
commit41cb78173636e0f6f463280afdf050583dbdb3dc (patch)
tree42224fe408d3048f210b565413feb34bfe08940c /pyaggr3g470r/utils.py
parentlast fixes (diff)
parentTypo. (diff)
downloadnewspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.gz
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.bz2
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.zip
Merge remote-tracking branch 'origin/master' into evol/api
Conflicts: bootstrap.py pyaggr3g470r/models.py pyaggr3g470r/notifications.py pyaggr3g470r/rest.py
Diffstat (limited to 'pyaggr3g470r/utils.py')
-rwxr-xr-xpyaggr3g470r/utils.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pyaggr3g470r/utils.py b/pyaggr3g470r/utils.py
index 01bcd36c..1fc84ff4 100755
--- a/pyaggr3g470r/utils.py
+++ b/pyaggr3g470r/utils.py
@@ -30,8 +30,7 @@ __license__ = "AGPLv3"
# This file provides functions used for:
# - the database management;
# - generation of tags cloud;
-# - HTML processing;
-# - e-mail notifications.
+# - HTML processing.
#
import re
@@ -130,7 +129,7 @@ def import_opml(email, opml_content):
new_feed = Feed(title=title, description=description,
link=link, site_link=site_link,
- email_notification=False, enabled=True)
+ enabled=True)
user.feeds.append(new_feed)
nb += 1
@@ -155,7 +154,7 @@ def import_json(email, json_content):
continue
new_feed = Feed(title=feed["title"], description="", link=feed["link"], \
- site_link=feed["site_link"], email_notification=feed["email_notification"], \
+ site_link=feed["site_link"], \
created_date=datetime.datetime.fromtimestamp(int(feed["created_date"])),
enabled=feed["enabled"])
user.feeds.append(new_feed)
bgstack15