[Nym3-commit] r154 - trunk/nym3/Client

[laurent at komite.net]

Author: laurent
Date: 2005-01-04 00:02:56 +0100 (Tue, 04 Jan 2005)
New Revision: 154

Added:
   trunk/nym3/Client/Keyring.py
Modified:
   trunk/nym3/Client/testcurses.py
Log:
Revert change from r153 and start the keyring.


Added: trunk/nym3/Client/Keyring.py
===================================================================
--- trunk/nym3/Client/Keyring.py	2005-01-03 14:31:29 UTC (rev 153)
+++ trunk/nym3/Client/Keyring.py	2005-01-03 23:02:56 UTC (rev 154)
@@ -0,0 +1,22 @@
+# $Id$
+
+import pickle
+
+class Keyring:
+    """Class that holds a user keyring"""
+
+    def __init__(self, keyfile):
+	self.keyfile = keyfile
+	try:
+	    f = open(keyfile, 'r')
+	    self.data = pickle.load(f)
+	    f.close
+	except IOError:
+	    raise "Duh"
+	self.encdata = self.data['keyring']
+	self.checksum = self.data['checksum']
+	self.status = 'encrypted'
+
+    def decrypt(self, passphrase):
+	"""Decrypt the keyring"""
+	pass


Property changes on: trunk/nym3/Client/Keyring.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/nym3/Client/testcurses.py
===================================================================
--- trunk/nym3/Client/testcurses.py	2005-01-03 14:31:29 UTC (rev 153)
+++ trunk/nym3/Client/testcurses.py	2005-01-03 23:02:56 UTC (rev 154)
@@ -552,9 +552,6 @@
 		    self.action[c]()
 		if t:
 		    self.tagprefix = False
-		    # This is mutt's behaviour and I think it's sensible:
-		    # tagged message are only tagged for one command.
-		    self.tagged = {}
 	    elif self.mode == Screen_ctx.MODE_PAGER:
 		if self.pager_action.has_key(c):
 		    self.pager_action[c]()