SF.net SVN: fclient: [485] trunk/fcp2/src/fcp2/key.py

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

Revision: 485
          http://fclient.svn.sourceforge.net/fclient/?rev=485&view=rev
Author:   jUrner
Date:     2008-07-02 02:59:48 -0700 (Wed, 02 Jul 2008)

Log Message:
-----------
beautify

Modified Paths:
--------------
    trunk/fcp2/src/fcp2/key.py

Modified: trunk/fcp2/src/fcp2/key.py
===================================================================
--- trunk/fcp2/src/fcp2/key.py	2008-07-02 07:05:37 UTC (rev 484)
+++ trunk/fcp2/src/fcp2/key.py	2008-07-02 09:59:48 UTC (rev 485)
@@ -54,34 +54,6 @@
 	if result.startswith('/'):
 		result = result[1:]
 	return result
-	
-#****************************************************************************************
-# freenet keys
-#
-# KeyType@32 bytes hash, 32 bytes encryption key, 5 bytes extra
-#
-# all byte components are base64 encoded. Freenet uses base64 without padding
-# along with the following altchars for urlsave encode: - for + and ~ for /      
-# see: freenet/support/base64.java
-#
-# so a key as the user gets it to see is:
-# KeyType@43 bytes, 43 bytes, 7 bytes  ..of [A-Za-z0-9\-~]
-#
-# see: [freenet/src/support/base64.java]
-#
-#***************************************************************************************
-class _KeyMeta(type):
-	"""Metaclass for freenet keys"""
-	
-	def __new__(klass, name, bases, kws):
-		"""Registers a key type to L{KeyTypesAll}
-		@note: if KeyType of the the key type is None it will not get registered
-		"""
-		
-		newClass = type.__new__(klass, name, bases, kws)
-		if newClass.KeyType is not None:
-			KeyTypesAll[newClass.KeyType] = newClass
-		return newClass
 
 #**************************************************************************************
 # 
@@ -141,6 +113,34 @@
 		@return: (str) fcp key
 		"""
 		return key.toString()
+	
+#****************************************************************************************
+# freenet keys
+#
+# KeyType@32 bytes hash, 32 bytes encryption key, 5 bytes extra
+#
+# all byte components are base64 encoded. Freenet uses base64 without padding
+# along with the following altchars for urlsave encode: - for + and ~ for /      
+# see: freenet/support/base64.java
+#
+# so a key as the user gets it to see is:
+# KeyType@43 bytes, 43 bytes, 7 bytes  ..of [A-Za-z0-9\-~]
+#
+# see: [freenet/src/support/base64.java]
+#
+#***************************************************************************************
+class _KeyMeta(type):
+	"""Metaclass for freenet keys"""
+	
+	def __new__(klass, name, bases, kws):
+		"""Registers a key type to L{KeyTypesAll}
+		@note: if KeyType of the the key type is None it will not get registered
+		"""
+		
+		newClass = type.__new__(klass, name, bases, kws)
+		if newClass.KeyType is not None:
+			KeyTypesAll[newClass.KeyType] = newClass
+		return newClass
 
 
 def Key(string):
@@ -216,7 +216,6 @@
 			key = clss(d['keyData'], filename=d['filename'])
 			return key
 
-
 	
 class KeySSK(_KeyBase):
 	_key_pattern_ = '''


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