Removed deprecated types UNICODE, FIXED_UNICODE and LONG_UNICODE.

anthony-tuininga · anthony-tuininga · commit 55b0d5d48054 · 2017-02-03T14:19:52.000-07:00
diff --git a/doc/module.rst b/doc/module.rst
@@ -814,13 +814,6 @@ Types
       This type is an extension to the DB API definition.
 
 
-.. data:: FIXED_UNICODE
-
-   .. note::
-
-      Deprecated. Please use FIXED_NCHAR instead.
-
-
 .. data:: INTERVAL
 
    This type object is used to describe columns in a database that are of type
@@ -873,13 +866,6 @@ Types
       This type is an extension to the DB API definition.
 
 
-.. data:: LONG_UNICODE
-
-   .. note::
-
-      Deprecated. Please use LONG_NCHAR instead.
-
-
 .. data:: NATIVE_FLOAT
 
    This type object is used to describe columns in a database that are of type
@@ -957,13 +943,6 @@ Types
       This attribute is an extension to the DB API definition.
 
 
-.. data:: UNICODE
-
-   .. note::
-
-      Deprecated. Please use NCHAR instead.
-
-
 .. _exceptions:
 
 Exceptions
diff --git a/doc/releasenotes.rst b/doc/releasenotes.rst
@@ -50,6 +50,8 @@ Version 5.3 (TBD)
 23) Added support for pickling/unpickling error objects
     (`Issue #23 <https://bitbucket.org/anthony_tuininga/cx_oracle/issues/23>`_)
 24) Dropped support for callbacks on OCI functions.
+25) Removed deprecated types UNICODE, FIXED_UNICODE and LONG_UNICODE (use
+    NCHAR, FIXED_NCHAR and LONG_NCHAR instead).
 
 
 Version 5.2.1 (January 2016)
diff --git a/src/cx_Oracle.c b/src/cx_Oracle.c
@@ -451,9 +451,6 @@ static PyObject *Module_Initialize(void)
     ADD_TYPE_OBJECT("DATETIME", &g_DateTimeVarType)
     ADD_TYPE_OBJECT("FIXED_CHAR", &g_FixedCharVarType)
     ADD_TYPE_OBJECT("FIXED_NCHAR", &g_FixedNCharVarType)
-    ADD_TYPE_OBJECT("FIXED_UNICODE", &g_FixedNCharVarType)
-    ADD_TYPE_OBJECT("UNICODE", &g_NCharVarType)
-    ADD_TYPE_OBJECT("LONG_UNICODE", &g_LongNCharVarType)
     ADD_TYPE_OBJECT("NCHAR", &g_NCharVarType)
     ADD_TYPE_OBJECT("LONG_NCHAR", &g_LongNCharVarType)
     ADD_TYPE_OBJECT("INTERVAL", &g_IntervalVarType)
