From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 5 Dec 2001 06:42:36 +0000 (+0000)
Subject: backport 1.21 and 1.22
X-Git-Tag: v2.1.2c1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fcbe88627799d824d4cb7db8c06231d79f0bfb7;p=thirdparty%2FPython%2Fcpython.git

backport 1.21 and 1.22
--
Fix malformed line (PyChecker)
--
_os should be os; reported by Neal Norwitz.
--
---

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index bdd6c31196b4..e766771190f9 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -74,7 +74,7 @@ def _synthesize(browser):
         controller.basename = os.path.basename(browser)
         register(browser, None, controller)
         return [None, controller]
-    ret
+    return [None, None]
 
 
 def _iscommand(cmd):
@@ -179,7 +179,7 @@ class Grail:
         import tempfile
         tempdir = os.path.join(tempfile.gettempdir(),
                                ".grail-unix")
-        user = pwd.getpwuid(_os.getuid())[0]
+        user = pwd.getpwuid(os.getuid())[0]
         filename = os.path.join(tempdir, user + "-*")
         maybes = glob.glob(filename)
         if not maybes: