Merge lp:~ralsina/ubuntu-sso-client/fix_801550 into lp:ubuntu-sso-client

Proposed by Roberto Alsina on 2011-06-24
Status: Merged
Approved by: Roberto Alsina on 2011-06-24
Approved revision: 724
Merged at revision: 724
Proposed branch: lp:~ralsina/ubuntu-sso-client/fix_801550
Merge into: lp:ubuntu-sso-client
Diff against target: 16 lines (+5/-1)
1 file modified
ubuntu_sso/qt/controllers.py (+5/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/fix_801550
Reviewer Review Type Date Requested Status
John Lenton 2011-06-24 Approve on 2011-06-24
Review via email: mp+65782@code.launchpad.net

Commit message

Import PIL both ways so it works however it's installed.

Description of the change

Import PIL both ways so it works however it's installed.

To post a comment you must log in.
John Lenton (chipaca) wrote :

A+++++ coder! would review again!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/controllers.py'
2--- ubuntu_sso/qt/controllers.py 2011-04-02 02:01:24 +0000
3+++ ubuntu_sso/qt/controllers.py 2011-06-24 12:45:52 +0000
4@@ -20,7 +20,11 @@
5 import StringIO
6 import tempfile
7
8-from PIL import Image
9+try:
10+ from PIL import Image
11+except ImportError:
12+ import Image
13+
14 from PyQt4.QtGui import QMessageBox, QWizard, QPixmap
15 from PyQt4.QtCore import QUrl
16 from twisted.internet.defer import inlineCallbacks, returnValue

Subscribers

People subscribed via source and target branches