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
=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py 2011-04-02 02:01:24 +0000
+++ ubuntu_sso/qt/controllers.py 2011-06-24 12:45:52 +0000
@@ -20,7 +20,11 @@
20import StringIO20import StringIO
21import tempfile21import tempfile
2222
23from PIL import Image23try:
24 from PIL import Image
25except ImportError:
26 import Image
27
24from PyQt4.QtGui import QMessageBox, QWizard, QPixmap28from PyQt4.QtGui import QMessageBox, QWizard, QPixmap
25from PyQt4.QtCore import QUrl29from PyQt4.QtCore import QUrl
26from twisted.internet.defer import inlineCallbacks, returnValue30from twisted.internet.defer import inlineCallbacks, returnValue

Subscribers

People subscribed via source and target branches