Ubuntu Apps Directory

Merge lp:~elachuni/ubuntu-webcatalog/precise into lp:ubuntu-webcatalog

  1. precise
  2. Merge into trunk
Proposed by Anthony Lenton
Status: Merged
Approved by: Danny Tamez
Approved revision: 156
Merged at revision: 160
Proposed branch: lp:~elachuni/ubuntu-webcatalog/precise
Merge into: lp:ubuntu-webcatalog
Diff against target: 15 lines (+4/-1)
1 file modified
src/webcatalog/auth.py (+4/-1)
To merge this branch: bzr merge lp:~elachuni/ubuntu-webcatalog/precise
Reviewer Review Type Date Requested Status
Danny Tamez (community) Approve
Review via email: mp+112876@code.launchpad.net

Commit message

Fall back to oauth.oauth if piston.oauth is unavailable.

Description of the change

On Ubuntu 12.04 Piston doesn't bundle oauth, so piston.oauth needs to fall back to oauth.oauth.

To post a comment you must log in.
Revision history for this message
Danny Tamez (zematynnad) wrote :

Looks good. No problems.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webcatalog/auth.py'
2--- src/webcatalog/auth.py 2012-06-06 17:42:04 +0000
3+++ src/webcatalog/auth.py 2012-06-30 00:13:22 +0000
4@@ -31,7 +31,10 @@
5 from django.http import HttpResponse
6 from oauth import oauth
7 from piston.authentication import OAuthAuthentication, oauth_datastore
8-from piston.oauth import OAuthError
9+try:
10+ from piston.oauth import OAuthError
11+except ImportError:
12+ from oauth.oauth import OAuthError
13
14 from webcatalog.models import Consumer, Token
15 from webcatalog.utilities import (

Subscribers

People subscribed via source and target branches