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 bdd6c31196b43e114da361300943ae8e66aeee3a..e766771190f9eb111c036dd4b27470943d046cce 100644 (file)
--- 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: