#17198: merge with 3.3.

diff --cc Lib/dbm/__init__.py
index 0609e4990c2f8ea5e134b8b9b9a75664528fa0fa,a783fde464b30fceb0e79d173a127577c56d88a5..5f4664a7c652d2091a4a5b76c6316c7b92994296
--- 1/Lib/dbm/__init__.py
--- 2/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 Lib/test/test_dbm.py
Simple merge

diff --cc Misc/NEWS
index d8a4ba0c022175c4b2929f02d53eba71c1e7926d,63d49693d7d788a7aa411482747a48110366a6bf..f457fddc2a16fc812c04ff5934b77129a5b54829
--- 1/Misc/NEWS
--- 2/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.