|
13 | 13 | import datetime
|
14 | 14 | import struct
|
15 | 15 | import sys
|
| 16 | +from collections import OrderedDict |
16 | 17 |
|
17 | 18 | import numpy as np
|
18 | 19 | from dateutil.relativedelta import relativedelta
|
@@ -1571,8 +1572,8 @@ def read(self, nrows=None, convert_dates=None,
|
1571 | 1572 | else:
|
1572 | 1573 | data_formatted.append((col, data[col]))
|
1573 | 1574 | if requires_type_conversion:
|
1574 |
| - data = DataFrame(dict(data_formatted), |
1575 |
| - columns=dict(data_formatted).keys()) |
| 1575 | + data = DataFrame(OrderedDict(data_formatted), |
| 1576 | + columns=OrderedDict(data_formatted).keys()) |
1576 | 1577 | del data_formatted
|
1577 | 1578 |
|
1578 | 1579 | self._do_convert_missing(data, convert_missing)
|
@@ -1610,8 +1611,8 @@ def read(self, nrows=None, convert_dates=None,
|
1610 | 1611 | convert = True
|
1611 | 1612 | retyped_data.append((col, data[col].astype(dtype)))
|
1612 | 1613 | if convert:
|
1613 |
| - data = DataFrame(dict(retyped_data), |
1614 |
| - columns=dict(retyped_data).keys()) |
| 1614 | + data = DataFrame(OrderedDict(retyped_data), |
| 1615 | + columns=OrderedDict(retyped_data).keys()) |
1615 | 1616 |
|
1616 | 1617 | if index_col is not None:
|
1617 | 1618 | data = data.set_index(data.pop(index_col))
|
@@ -1724,8 +1725,8 @@ def _do_convert_categoricals(self, data, value_label_dict, lbllist,
|
1724 | 1725 | cat_converted_data.append((col, cat_data))
|
1725 | 1726 | else:
|
1726 | 1727 | cat_converted_data.append((col, data[col]))
|
1727 |
| - data = DataFrame(dict(cat_converted_data), |
1728 |
| - columns=dict(cat_converted_data).keys()) |
| 1728 | + data = DataFrame(OrderedDict(cat_converted_data), |
| 1729 | + columns=OrderedDict(cat_converted_data).keys()) |
1729 | 1730 | return data
|
1730 | 1731 |
|
1731 | 1732 | def data_label(self):
|
@@ -2000,8 +2001,8 @@ def _prepare_categoricals(self, data):
|
2000 | 2001 | data_formatted.append((col, values))
|
2001 | 2002 | else:
|
2002 | 2003 | data_formatted.append((col, data[col]))
|
2003 |
| - return DataFrame(dict(data_formatted), |
2004 |
| - columns=dict(data_formatted).keys()) |
| 2004 | + return DataFrame(OrderedDict(data_formatted), |
| 2005 | + columns=OrderedDict(data_formatted).keys()) |
2005 | 2006 |
|
2006 | 2007 | def _replace_nans(self, data):
|
2007 | 2008 | # return data
|
|
0 commit comments