From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 7 Jul 2013 11:16:05 +0000 (+0200)
Subject: #17198: merge with 3.3.
X-Git-Tag: v3.4.0a1~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f96789cdcb4548ecb9708fe78ffabedecd2d14c;p=python

#17198: merge with 3.3.
---

9f96789cdcb4548ecb9708fe78ffabedecd2d14c
diff --cc Lib/dbm/__init__.py
index 0609e4990c,a783fde464..5f4664a7c6
--- a/Lib/dbm/__init__.py
+++ b/Lib/dbm/__init__.py
@@@ -42,8 -42,13 +42,13 @@@ _names = ['dbm.gnu', 'dbm.ndbm', 'dbm.d
  _defaultmod = None
  _modules = {}
  
 -error = (error, IOError)
 +error = (error, OSError)
  
+ try:
+     from dbm import ndbm
+ except ImportError:
+     ndbm = None
+ 
  
  def open(file, flag='r', mode=0o666):
      """Open or create database at path given by *file*.
diff --cc Misc/NEWS
index d8a4ba0c02,63d49693d7..f457fddc2a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -142,11 -41,11 +142,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17198: Fix a NameError in the dbm module.  Patch by Valentina
+   Mukhamedzhanova.
+ 
  - Issue #18013: Fix cgi.FieldStorage to parse the W3C sample form.
  
 +- Issue #18020: improve html.escape speed by an order of magnitude.
 +  Patch by Matt Bryant.
 +
  - Issue #18347: ElementTree's html serializer now preserves the case of
    closing tags.