Merge tag 'v0.10.2' into baserock/morphbaserock/morph

v0.10 post-release tag for pyinstaller support

1 files changed, 9 insertions, 3 deletions

diff --git a/cxmanage_test/image_test.py b/cxmanage_test/image_test.py
index 609aa5b..71e8000 100644
--- a/cxmanage_test/image_test.py
+++ b/cxmanage_test/image_test.py
@@ -1,4 +1,7 @@
-# Copyright (c) 2012, Calxeda Inc.
+"""Calxeda: image_test.py"""
+
+
+# Copyright (c) 2012-2013, Calxeda Inc.
 #
 # All rights reserved.
 #
@@ -39,6 +42,8 @@ from cxmanage_api.tftp import InternalTftp
 
 from cxmanage_test import random_file, TestImage
 
+
+# pylint: disable=R0904
 class ImageTest(unittest.TestCase):
     """ Tests involving cxmanage images
 
@@ -72,13 +77,14 @@ class ImageTest(unittest.TestCase):
         self.assertEqual(header.daddr, daddr)
         self.assertEqual(simg[header.imgoff:], contents)
 
-    def test_multiple_uploads(self):
+    @staticmethod
+    def test_multiple_uploads():
         """ Test to make sure FDs are being closed """
         # Create image
         filename = random_file(1024)
         image = TestImage(filename, "RAW")
 
-        for x in xrange(2048):
+        for _ in xrange(2048):
             image.render_to_simg(0, 0)
 
         os.remove(filename)