Merge files (with conflicts). Branch is thoroughly broken, and we are…

… replacing all of these files in the next commit

CHANGELOG

@@ -1,13 +1,26 @@
+TextAdapter Release Notes
+=========================
+
+2016-10-30: 2.0.0
+-----------------
+
+* Release the closed source of IOPro as Freee Software.  Touch up some
+naming issues and small tweaks to build scripts, documentation, etc.
+
+
 IOPro Release Notes
 ===================
 
-
 2016-07-30:  1.9.0
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Remove warnings and documentation for unsupported Numba use
 * Rewrite most documentation for clarity and accuracy
@@ -16,21 +29,29 @@ IOPro Release Notes
 
 2016-04-05:  1.8.0:
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***--------
 =======
 -------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+-------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Add PostgresAdapter for reading data from PostgreSQL databases
 * Add AccumuloAdapter for reading data from Accumulo databases
 
 
 2015-10-09:  1.7.2:
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***--------
 =======
 -------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+-------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix an issue with pyodbc where result NumPy arrays could return
   uninitialized data after the actual data null character.  Now it pads
@@ -39,20 +60,28 @@ IOPro Release Notes
 
 2015-05-04:  1.7.1
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Properly cache output string objects for better performance
 
 
 2015-03-02:  1.7.0
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***--------
 =======
 -------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+-------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Add Python 3 support
 * Add support for parsing utf8 text files
@@ -61,40 +90,56 @@ IOPro Release Notes
 
 2015-02-02:  1.6.11
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***--------
 =======
 -------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+-------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue with escape char not being parsed correctly inside quoted strings
 
 
 2014-12-17:  1.6.10
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***--------
 =======
 -------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+-------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue with using field filters with json parser
 
 
 2014-12-02:  1.6.9
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue with json field names getting mixed up
 
 
 2014-11-20:  1.6.8
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue with return nulls returning wrong "null" for large queries
   (more than 10000 rows) in some circumstances.
@@ -109,20 +154,28 @@ IOPro Release Notes
 
 2014-07-03:  1.6.7
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue when reading more than 10000 rows containing unicode strings in platform where ODBC uses UTF-16/UCS2 encoding (notably Windows and unixODBC). The resulting data could be corrupt.
 
 
 2014-06-16:  1.6.6
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix possible segfault when dealing with unicode strings in platforms where ODBC uses UTF-16/UCS2 encoding (notably Windows and unixODBC)
 * Add iopro_set_text_limit function to iopro. It globally limits the size of text fields read by fetchdictarray and fetchsarray. By default it is set to 1024 characters.
@@ -132,52 +185,72 @@ IOPro Release Notes
 
 2014-05-07:  1.6.5
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix crash when building textadapter index
 
 
 2014-04-29:  1.6.4
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix default value for null strings in IOPro/pyodbc changed to be an empty string instead of 'NA'. NA was not appropriate as it can collide with valid data (Namibia country code is 'NA', for example), and it failed with single character columns.
 * Ignore SQlRowCount when performing queries with fetchsarray and fetchdictarray, since SQLRowCount sometimes returns incorrect number of rows.
 
 
 2014-03-25:  1.6.3
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix SQL TINYINT is now returned as an unsigned 8 bit integer in fetchdictarray/fetchsarray. This is to match the range specified in SQL (0...255). It was being returned as a signed 8 bit integer before (range -128...127)
 * Add Preliminary unicode string support in fetchdictarray/fetchsarray.
 
 
 2014-02-12:  1.6.2
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Disable Numba support for version 0.12 due to lack of string support.
 
 
 2014-01-30:  1.6.1
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix a regression that made possible some garbage in string fields when using fetchdictarray/fetchsarray.
 * Fix a problem where heap corruption could happen in IOPro.pyodbc fetchdictarray/fetchsarray related to nullable string fields.
@@ -187,10 +260,14 @@ IOPro Release Notes
 
 2013-10-30:  1.6.0
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Add JSON support
 * Misc bug fixes
@@ -199,20 +276,28 @@ IOPro Release Notes
 
 2013-06-12:  1.5.5
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Fix issue parsing negative ints with leading whitespace in csv data.
 
 
 2013-06-10:  1.5.4
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Allow delimiter to be set to None for csv files with single field.
 * Fill in missing csv fields with fill values.
@@ -223,40 +308,56 @@ IOPro Release Notes
 
 2013-06-05:  1.5.3
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Temporary fix for IndexError exception in TextAdapter.__read_slice method.
 
 
 2013-05-28:  1.5.2
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Add ability to specify escape character in csv data
 
 
 2013-05-23:  1.5.1
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * fixed coredump when using datetime with numpy < 1.7
 
 
 2013-05-22:  1.5.0
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Added a cancel method to the Cursor object in iopro.pyodbc.
   This method wraps ODBC SQLCancel.
@@ -270,10 +371,14 @@ IOPro Release Notes
 
 2013-04-05:  1.4.3
 <<<<<<< HEAD
+<<<<<<< HEAD
 ***REMOVED***-------
 =======
 ------------------
 >>>>>>> 14dcbb9542f8d05344fd4a2cc4ef07c47528a8f1
+=======
+------------------
+>>>>>>> 0e94e8123ce07aa964a82f678b115c7defb0a49c
 
 * Update loadtxt and genfromtxt to reflect numpy versions' behavior
   for dealing with whitespace (default to any whitespace as delimiter,