Avoid forward-declaring the methods array.
Rename unicodedata.db* to unicodedata.ucd*
diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py
index fde710b..3d3ed23 100644
--- a/Lib/encodings/idna.py
+++ b/Lib/encodings/idna.py
@@ -1,7 +1,7 @@
# This module implements the RFCs 3490 (IDNA) and 3491 (Nameprep)
import stringprep, re, codecs
-from unicodedata import db_3_2_0 as unicodedata
+from unicodedata import ucd_3_2_0 as unicodedata
# IDNA section 3.1
dots = re.compile(u"[\u002E\u3002\uFF0E\uFF61]")
diff --git a/Lib/stringprep.py b/Lib/stringprep.py
index 225aedb..1d49dd1 100644
--- a/Lib/stringprep.py
+++ b/Lib/stringprep.py
@@ -5,7 +5,7 @@
and mappings, for which a mapping function is provided.
"""
-from unicodedata import db_3_2_0 as unicodedata
+from unicodedata import ucd_3_2_0 as unicodedata
assert unicodedata.unidata_version == '3.2.0'