From 60960e05e9a6eee89e5137daed5884f423e6af24 Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Wed, 17 Jun 2015 22:52:56 +0200
Subject: Remove env. variables in a neater way.

---
 testsuite.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/testsuite.py b/testsuite.py
index 2fc7885..0fb9992 100644
--- a/testsuite.py
+++ b/testsuite.py
@@ -432,10 +432,8 @@ def run_selftests():
     def verify_print(o, s):
         verify_equals(str(o), textwrap.dedent(s[1:]))
 
-    try:
-        del os.environ["ARCH"], os.environ["SRCARCH"], os.environ["srctree"]
-    except:
-        pass
+    for var in ("ARCH", "SRCARCH", "srctree"):
+        os.environ.pop(var, None)
 
     # The tests below aren't meant to imply that the format is set in stone.
     # It's just to verify that the strings do not change unexpectedly.
-- 
cgit v1.2.3