diff options
author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2014-06-10 07:33:55 +0200 |
---|---|---|
committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2014-06-10 07:33:55 +0200 |
commit | b9c87898dacf5b671dc1fb8ddfd7d2bd3e1de868 (patch) | |
tree | 9dd6159e3d7768ed04d670053692ca01ac027fb4 /pyaggr3g470r/utils.py | |
parent | Fixed a problem when running in standalone mode. (diff) | |
download | newspipe-b9c87898dacf5b671dc1fb8ddfd7d2bd3e1de868.tar.gz newspipe-b9c87898dacf5b671dc1fb8ddfd7d2bd3e1de868.tar.bz2 newspipe-b9c87898dacf5b671dc1fb8ddfd7d2bd3e1de868.zip |
Not writing JSON file when importing an account.
Diffstat (limited to 'pyaggr3g470r/utils.py')
-rwxr-xr-x | pyaggr3g470r/utils.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pyaggr3g470r/utils.py b/pyaggr3g470r/utils.py index 50549587..336ec804 100755 --- a/pyaggr3g470r/utils.py +++ b/pyaggr3g470r/utils.py @@ -133,15 +133,12 @@ def import_opml(email, opml_content): db.session.commit() return nb -def import_json(email, json_file): +def import_json(email, json_content): """ Import an account from a JSON file. """ user = User.query.filter(User.email == email).first() - json_string = "" - with open(json_file, "r") as account: - json_string = account.read() - json_account = json.loads(json_string) + json_account = json.loads(json_content) nb_feeds, nb_articles = 0, 0 # Create feeds |