From d9a7cd1da64da57bea05e5b234b9d9c6fea7f911 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Sun, 11 Apr 2010 01:39:31 +0200
Subject: applied 2to3 and fixed the result

---
 portato/backend/flags.py | 77 ++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

(limited to 'portato/backend/flags.py')

diff --git a/portato/backend/flags.py b/portato/backend/flags.py
index 810b607..45826c3 100644
--- a/portato/backend/flags.py
+++ b/portato/backend/flags.py
@@ -10,8 +10,6 @@
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
-from __future__ import absolute_import, with_statement
-
 import os
 import itertools as itt
 from subprocess import Popen, PIPE # needed for grep
@@ -134,7 +132,7 @@ def set_config (cfg):
 
     for i in CONFIG.keys():
         if not i in cfg:
-            raise KeyError, "Missing keyword in config: "+i
+            raise KeyError("Missing keyword in config: "+i)
 
     for i in CONFIG:
         CONFIG[i] = cfg[i]
@@ -583,31 +581,29 @@ def write_masked ():
                 list = system.split_cpv(cpv)
                 msg += "%s/%s\n" % (list[0],list[1])
             if not file in file_cache:
-                f = open(file, "a")
-                f.write(msg)
-                f.close()
+                with open(file, "a") as f:
+                    f.write(msg)
             else:
                 file_cache[file].append(msg)
         # change a line
         else:
             if not file in file_cache:
                 # read file
-                f = open(file, "r")
-                lines = []
-                i = 1
-                while i < line: # stop at the given line
-                    lines.append(f.readline())
-                    i = i+1
-                # delete
-                l = f.readline()
-                l = "#"+l[:-1]+" # removed by portato\n"
-                lines.append(l)
+                with open(file, "r") as f:
+                    lines = []
+                    i = 1
+                    while i < line: # stop at the given line
+                        lines.append(f.readline())
+                        i = i+1
+                    # delete
+                    l = f.readline()
+                    l = "#"+l[:-1]+" # removed by portato\n"
+                    lines.append(l)
                 
-                # read the rest
-                lines.extend(f.readlines())
+                    # read the rest
+                    lines.extend(f.readlines())
                 
-                file_cache[file] = lines
-                f.close()
+                    file_cache[file] = lines
             else: # in cache
                 l = file_cache[file][line-1]
                 # delete:
@@ -719,31 +715,29 @@ def write_testing ():
                     list = system.split_cpv(cpv)
                     msg += "%s/%s ~%s\n" % (list[0],list[1],arch)
                 if not file in file_cache:
-                    f = open(file, "a")
-                    f.write(msg)
-                    f.close()
+                    with open(file, "a") as f:
+                        f.write(msg)
                 else:
                     file_cache[file].append(msg)
             # change a line
             else:
                 if not file in file_cache:
                     # read file
-                    f = open(file, "r")
-                    lines = []
-                    i = 1
-                    while i < line: # stop at the given line
-                        lines.append(f.readline())
-                        i = i+1
-                    # delete
-                    l = f.readline()
-                    l = "#"+l[:-1]+" # removed by portato\n"
-                    lines.append(l)
-                    
-                    # read the rest
-                    lines.extend(f.readlines())
-                    
-                    file_cache[file] = lines
-                    f.close()
+                    with open(file, "r") as f:
+                        lines = []
+                        i = 1
+                        while i < line: # stop at the given line
+                            lines.append(f.readline())
+                            i = i+1
+                        # delete
+                        l = f.readline()
+                        l = "#"+l[:-1]+" # removed by portato\n"
+                        lines.append(l)
+                        
+                        # read the rest
+                        lines.extend(f.readlines())
+                        
+                        file_cache[file] = lines
                 else: # in cache
                     l = file_cache[file][line-1]
                     # delete:
@@ -752,9 +746,8 @@ def write_testing ():
     
     # write to disk
     for file in file_cache.keys():
-        f = open(file, "w")
-        f.writelines(file_cache[file])
-        f.close()
+        with open(file, "w") as f:
+            f.writelines(file_cache[file])
     # reset
     newTesting = {}
     system.reload_settings()
-- 
cgit v1.2.3-54-g00ecf