SF.net SVN: fclient: [416] trunk/sandbox/fcp2/message.py

[<jU...@us...>]

Revision: 416
          http://fclient.svn.sourceforge.net/fclient/?rev=416&view=rev
Author:   jUrner
Date:     2008-06-29 03:58:33 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
implemented autoconvert fcp keys to python keys

Modified Paths:
--------------
    trunk/sandbox/fcp2/message.py

Modified: trunk/sandbox/fcp2/message.py
===================================================================
--- trunk/sandbox/fcp2/message.py	2008-06-29 10:57:31 UTC (rev 415)
+++ trunk/sandbox/fcp2/message.py	2008-06-29 10:58:33 UTC (rev 416)
@@ -16,6 +16,7 @@
 
 from fcp2 import consts
 from fcp2 import types
+from fcp2 import key
 from fcp2.fcp_lib import pmstruct
 from fcp2.fcp_lib import node
 from fcp2.fcp_lib import uuid
@@ -143,7 +144,7 @@
 			paramType = self._param_types_.get(param, None)
 			if paramType is not None:
 				value = paramType.pythonToFcp(value)
-							
+											
 			out.append('%s=%s' % (param, value))
 		
 		if self.data is None:
@@ -330,11 +331,11 @@
 		'node.scheduler.SSKinserter_priority_policy': types.FcpTypeChoicePriorityPolicy,
 		'node.scheduler.SSKrequester_priority_policy': types.FcpTypeChoicePriorityPolicy,
 		
-		'node.updater.URI': types.FcpTypeUri,
+		'node.updater.URI': key.FcpTypeKey,
 		'node.updater.autoupdate': types.FcpTypeBool,
 		'node.updater.enabled': types.FcpTypeBool,
-		'node.updater.extURI': types.FcpTypeUri,
-		'node.updater.revocationURI': types.FcpTypeUri,
+		'node.updater.extURI': key.FcpTypeKey,
+		'node.updater.revocationURI': key.FcpTypeKey,
 				
 		'pluginmanager.loadplugin': types.FcpTypeStringList,
 		'pluginmanager2.loadedPlugins': types.FcpTypeStringList,
@@ -676,6 +677,7 @@
 		'MaxRetries': types.FcpTypeInt,
 		'MaxSize': types.FcpTypeInt,
 		'MaxTempSize': types.FcpTypeInt,
+		'URI': key.FcpTypeKey,
 		'Verbosity': types.FcpTypeInt,
 		}
 		
@@ -712,6 +714,7 @@
 		'GetCHKOnly': types.FcpTypeBool,
 		'Global': types.FcpTypeBool,
 		'MaxRetries': types.FcpTypeInt,
+		'URI': key.FcpTypeKey,
 		'Verbosity': types.FcpTypeInt,
 		}
 	
@@ -861,6 +864,7 @@
 		'Fatal': types.FcpTypeBool,
 		'FinalizedExpected': types.FcpTypeBool,
 		'Global': types.FcpTypeBool,
+		'RedirectURI': key.FcpTypeKey,
 		}
 
 
@@ -969,6 +973,7 @@
 	_additional_params_ = {}
 	_param_types_ = {
 		'ark.number': types.FcpTypeInt,
+		'ark.privURI': key.FcpTypeKey,
 		'auth.negTypes': types.FcpTypeInt,
 		'location': types.FcpTypeFloat,
 		'opennet': types.FcpTypeBool,
@@ -1210,6 +1215,7 @@
 	_additional_params_ = {}
 	_param_types_ = {
 		'Code': types.FcpTypeInt,
+		'ExpectedURI': key.FcpTypeKey,
 		'Global': types.FcpTypeBool,
 		}
 
@@ -1219,6 +1225,7 @@
 	_additional_params_ = {}
 	_param_types_ = {
 		'Global': types.FcpTypeBool,
+		'URI': key.FcpTypeKey,
 		}
 
 #####################################
@@ -1230,6 +1237,7 @@
 	_additional_params_ = {}
 	_param_types_ = {
 		'Global': types.FcpTypeBool,
+		'URI': key.FcpTypeKey,
 		}
 
 
@@ -1252,6 +1260,8 @@
 	name = consts.Message. SSKKeypair
 	_additional_params_ = {}
 	_param_types_ = {
+		'InsertURI': key.FcpTypeKey,
+		'RequestURI': key.FcpTypeKey,
 		}
 		
 
@@ -1287,6 +1297,7 @@
 	_additional_params_ = AdditionalSubscribeUSKParams
 	_param_types_ = {
 		'DontPoll': types.FcpTypeBool,
+		'URI': key.FcpTypeKey,
 		}
 
 
@@ -1295,6 +1306,7 @@
 	_additional_params_ = {}
 	_param_types_ = {
 		'Edition': types.FcpTypeInt,
+		'URI': key.KeyBase,
 		}
 
 
@@ -1334,6 +1346,7 @@
 	name = consts.Message.URIGenerated
 	_additional_params_ = {}
 	_param_types_ = {
+		'URI': key.FcpTypeKey,
 		}
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.