summaryrefslogtreecommitdiff
path: root/sunshine
diff options
context:
space:
mode:
authorKrzysztof Klinikowski <kkszysiu@gmail.com>2010-02-02 13:45:18 +0100
committerKrzysztof Klinikowski <kkszysiu@gmail.com>2010-02-02 13:45:18 +0100
commit37bc9564c53e25214e4a38f31a0b15e49a9eeff7 (patch)
tree2705724420c3ee51a58c46c5efda2d3cc966645f /sunshine
parent01a91829ae1ffb11e46e6c9c1ed212a1612ff104 (diff)
Better oAuth module detection and small fix.
Diffstat (limited to 'sunshine')
-rw-r--r--sunshine/avatars.py2
-rw-r--r--sunshine/lqsoft/gaduapi.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/sunshine/avatars.py b/sunshine/avatars.py
index 365e31d..1cfd905 100644
--- a/sunshine/avatars.py
+++ b/sunshine/avatars.py
@@ -22,7 +22,7 @@ import imghdr
import hashlib
import dbus
import StringIO
-from lqsoft.gaduapi import *
+from sunshine.lqsoft.gaduapi import *
import telepathy
diff --git a/sunshine/lqsoft/gaduapi.py b/sunshine/lqsoft/gaduapi.py
index 33c612b..7a80b93 100644
--- a/sunshine/lqsoft/gaduapi.py
+++ b/sunshine/lqsoft/gaduapi.py
@@ -31,8 +31,9 @@ except ImportError:
try:
import oauth as oauth
+ test_oauth = oauth.OAuthSignatureMethod_HMAC_SHA1()
oauth_loaded = True
-except ImportError:
+except:
logger.info("oAuth module can't be loaded")
oauth_loaded = False
import json