Always use with to open files #280

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/attributecode/model.py

@@ -514,7 +514,8 @@ def _validate(self, *args, **kwargs):
             try:
                 # TODO: we have lots the location by replacing it with a text
                 location = add_unc(location)
-                text = codecs.open(location, encoding='utf-8', errors='ignore').read()
+                with codecs.open(location, encoding='utf-8', errors='ignore') as txt:
+                    text = txt.read()
                 self.value[path] = text
             except Exception as e:
                 # only keep the first 100 char of the exception
@@ -964,7 +965,8 @@ def load(self, location):
         errors = []
         try:
             loc = add_unc(loc)
-            input_text = codecs.open(loc, encoding='utf-8').read()
+            with codecs.open(loc, encoding='utf-8') as txt:
+                input_text = txt.read()
             """
             The running_inventory defines if the current process is 'inventory' or not.
             This is used for the validation of the about_resource_path.

tests/test_attrib.py

@@ -32,18 +32,21 @@ def test_check_template(self):
         assert attrib.check_template('template_string') == None
         assert attrib.check_template('{{template_string') == (1,
           "unexpected end of template, expected 'end of print statement'.",)
-        template = open(get_test_loc('attrib_gen/test.template')).read()
+        with open(get_test_loc('attrib_gen/test.template')) as tmpl:
+            template = tmpl.read()
         assert attrib.check_template(template) == None
 
     def test_check_template_default_is_valid(self):
-        template = open(attrib.default_template).read()
+        with open(attrib.default_template) as tmpl:
+            template = tmpl.read()
         assert attrib.check_template(template) == None
 
     def test_generate(self):
         expected = (u'Apache HTTP Server: 2.4.3\n'
                     u'resource: httpd-2.4.3.tar.gz\n')
         test_file = get_test_loc('attrib_gen/attrib.ABOUT')
-        template = open(get_test_loc('attrib_gen/test.template')).read()
+        with open(get_test_loc('attrib_gen/test.template')) as tmpl:
+            template = tmpl.read()
         _errors, abouts = model.collect_inventory(test_file)
         result = attrib.generate(abouts, template)
         self.assertEqual(expected, result)
@@ -52,6 +55,7 @@ def test_generate_from_file_with_default_template(self):
         test_file = get_test_loc('attrib_gen/attrib.ABOUT')
         _errors, abouts = model.collect_inventory(test_file)
         result = attrib.generate_from_file(abouts)
-        expected = unicode(open(get_test_loc('attrib_gen/expected_default_attrib.html')).read())
+        with open(get_test_loc('attrib_gen/expected_default_attrib.html')) as exp:
+            expected = unicode(exp.read())
         self.assertEqual([x.rstrip() for x in expected.splitlines()],
                          [x.rstrip() for x in  result.splitlines()])