1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Description: Import installed keyring instead of thirdparty/.
See debian/copyright.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed
--- a/taskcoachlib/widgets/password.py
+++ b/taskcoachlib/widgets/password.py
@@ -31,7 +31,7 @@
hsz = wx.BoxSizer(wx.HORIZONTAL)
hsz.Add(wx.StaticText(pnl, wx.ID_ANY, _('Password:')), 0, wx.ALL, 3)
- from taskcoachlib.thirdparty.keyring import get_password
+ from keyring import get_password
password = get_password(self.domain, self.username)
self.password = (password or '').decode('UTF-8')
self.passwordField = wx.TextCtrl(pnl, wx.ID_ANY, self.password, style=wx.TE_PASSWORD)
@@ -65,7 +65,7 @@
def OnOK(self, event):
self.password = self.passwordField.GetValue()
- from taskcoachlib.thirdparty.keyring import set_password
+ from keyring import set_password
if self.keepInKeychain.GetValue():
set_password(self.domain, self.username, self.password.encode('UTF-8'))
else:
@@ -98,7 +98,7 @@
def GetPassword(domain, username, reset=False):
try:
- from taskcoachlib.thirdparty.keyring import set_password, get_password
+ from keyring import set_password, get_password
except:
# Keychain unavailable.
return _GetCachedPassword(domain, username, reset)
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,6 @@
cd thirdparty; tar xzf chardet-2.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty chardet-2.1.1/chardet
cd thirdparty; tar xzf python-dateutil-1.5.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-dateutil-1.5/dateutil
cd thirdparty; tar xzf desktop-0.4.2.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty desktop-0.4.2/desktop
- cd thirdparty; tar xzf keyring-3.7.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty keyring-3.7/keyring
cp /usr/share/pyshared/lockfile.py taskcoachlib/thirdparty
cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
|
