From f00090846ef202f8488c81ca61e16c9c82cc7cc9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 10 May 2013 08:32:51 -0500 Subject: [PATCH] fixed some dropbox issues, thanks Jesus --- VERSION | 2 +- gluon/contrib/login_methods/dropbox_account.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index b0b9ab29..aa8ae9b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.10.08.28.07 +Version 2.4.6-stable+timestamp.2013.05.10.08.32.00 diff --git a/gluon/contrib/login_methods/dropbox_account.py b/gluon/contrib/login_methods/dropbox_account.py index 19c4dd6e..8ae84f41 100644 --- a/gluon/contrib/login_methods/dropbox_account.py +++ b/gluon/contrib/login_methods/dropbox_account.py @@ -105,15 +105,15 @@ class DropboxAccount(object): def put(self, filename, file): if not hasattr(self,'client'): self.get_client() - return json.loads(self.client.put_file(filename, file))['bytes'] + return self.client.put_file(filename, file)['bytes'] - def get(self, filename, file): + def get(self, filename): if not hasattr(self,'client'): self.get_client() return self.client.get_file(filename) def dir(self, path): if not hasattr(self,'client'): self.get_client() - return json.loads(self.client.metadata(path)) + return self.client.metadata(path) def use_dropbox(auth, filename='private/dropbox.key', **kwargs):