Merge lp:~nataliabidart/ubuntu-sso-client/workaround-turkish-locale-failure into lp:ubuntu-sso-client

Proposed by Natalia Bidart
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 634
Merged at revision: 634
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/workaround-turkish-locale-failure
Merge into: lp:ubuntu-sso-client
Diff against target: 33 lines (+19/-1)
1 file modified
bin/ubuntu-sso-login (+19/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/workaround-turkish-locale-failure
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
John Lenton (community) Approve
Review via email: mp+37192@code.launchpad.net

Commit message

* Workaround for LP: #467397 (when using turkish locale, decimal module import fails).

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntu-sso-login'
2--- bin/ubuntu-sso-login 2010-09-08 18:35:43 +0000
3+++ bin/ubuntu-sso-login 2010-09-30 21:22:46 +0000
4@@ -21,11 +21,29 @@
5
6 """Run the dbus service for UserManagement and ApplicationCredentials."""
7
8-import gtk
9+# import decimal even if we don't need it.
10+import decimal
11+# This is a workaround for LP: #467397. Some module in our depency chain sets
12+# the locale and imports decimal, and that generates the following trace:
13+# Traceback (most recent call last):
14+# File "/usr/lib/ubuntu-sso-client/ubuntu-sso-login", line 33
15+# from ubuntu_sso.main import SSOLogin, SSOCredentials
16+# File "/usr/lib/pymodules/python2.6/ubuntu_sso/main.py", line 42
17+# from lazr.restfulclient.resource import ServiceRoot
18+# File "/usr/lib/python2.6/dist-packages/lazr/restfulclient/resource.py",
19+# line 34
20+# import simplejson
21+# File "/usr/lib/pymodules/python2.6/simplejson/__init__.py", line 109
22+# from decimal import Decimal
23+# File "/usr/lib/python2.6/decimal.py", line 3649, in <module>
24+# val = globals()[globalname]
25+# KeyError: 'ROUND_CEiLiNG'
26+
27 import signal
28 import sys
29
30 import dbus.service
31+import gtk
32
33 from dbus.mainloop.glib import DBusGMainLoop
34

Subscribers

People subscribed via source and target branches