stylistic changes

src/keas/kmi/README.txt

@@ -93,7 +93,7 @@ We can also encrypt data given by a file descriptor
 
   >>> import tempfile
   >>> tmp_file = tempfile.TemporaryFile()
-  >>> data=b"encryptioniscool"*24*1024
+  >>> data = b"encryptioniscool"*24*1024
   >>> pos = tmp_file.write(data)
   >>> pos = tmp_file.seek(0)
   >>> encrypted_file = tempfile.TemporaryFile()
@@ -103,7 +103,7 @@ We can also encrypt data given by a file descriptor
 And decrypt the file
 
   >>> decrypted_file = tempfile.TemporaryFile()
-  >>> pos =encrypted_file.seek(0)
+  >>> pos = encrypted_file.seek(0)
   >>> keys.decrypt_file(key, encrypted_file, decrypted_file)
   >>> encrypted_file.close()
 

src/keas/kmi/facility.py

@@ -37,7 +37,6 @@
 
 from hashlib import md5
 
-__docformat__ = "reStructuredText"
 
 logger = logging.getLogger('kmi')
 

src/keas/kmi/interfaces.py

@@ -18,9 +18,6 @@
 from zope.interface.common import mapping
 
 
-__docformat__ = "reStructuredText"
-
-
 class IEncryptionService(zope.interface.Interface):
     """Utility providing encryption mechanism"""
 

src/keas/kmi/keyholder.py

@@ -13,7 +13,6 @@
 ##############################################################################
 """Simple Key Holder
 """
-__docformat__ = "reStructuredText"
 from zope.interface import implementer
 from keas.kmi.interfaces import IKeyHolder
 

src/keas/kmi/testclient.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ##############################################################################
 #
 # Copyright (c) 2008 Zope Foundation and Contributors.
@@ -14,7 +13,7 @@
 ##############################################################################
 """Test client to access the KMI server API.
 """
-__docformat__ = "reStructuredText"
+from __future__ import print_function
 
 import os
 import sys
@@ -45,7 +44,8 @@ def new_key(kmf):
 
 def read_kek(kekfile):
     try:
-        return open(kekfile, 'rb').read()
+        with open(kekfile, 'rb') as fp:
+            return fp.read()
     except IOError as e:
         print("Could not read key encrypting key from %s" % kekfile, file=sys.stderr)
         print(e, file=sys.stderr)
@@ -57,7 +57,8 @@ def read_data(filename=None):
         return sys.stdin.read()
     else:
         try:
-            return open(filename, 'rb').read()
+            with open(filename, 'rb') as fp:
+                return fp.read()
         except IOError as e:
             print("Could not read %s" % filename, file=sys.stderr)
             print(e, file=sys.stderr)