Skip to content

Commit 2034f15

Browse files
authored
Merge pull request pandas-dev#760 from shashank88/env_var_pandas
Allow setting force_bytes_to_unicode from env
2 parents 6451b58 + 923b6f1 commit 2034f15

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

arctic/_config.py

+5
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,8 @@ class FwPointersCfg(Enum):
100100
ENABLE_CACHE = not bool(os.environ.get('DISABLE_CACHE'))
101101
CACHE_COLL = 'cache'
102102
CACHE_DB = 'meta_db'
103+
104+
# -------------------------------
105+
# Flag used to convert byte column/index/column names to unicode when read back.
106+
# -------------------------------
107+
FORCE_BYTES_TO_UNICODE = bool(os.environ.get('FORCE_BYTES_TO_UNICODE'))

arctic/store/_pandas_ndarray_store.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from arctic.serialization.numpy_records import SeriesSerializer, DataFrameSerializer
1010
from ._ndarray_store import NdarrayStore
1111
from .._compression import compress, decompress
12+
from .._config import FORCE_BYTES_TO_UNICODE
1213
from ..date._util import to_pandas_closed_closed
1314
from ..exceptions import ArcticException
1415

@@ -197,7 +198,9 @@ def append(self, arctic_lib, version, symbol, item, previous_version, **kwargs):
197198

198199
def read(self, arctic_lib, version, symbol, **kwargs):
199200
item = super(PandasDataFrameStore, self).read(arctic_lib, version, symbol, **kwargs)
200-
return self.SERIALIZER.deserialize(item, force_bytes_to_unicode=kwargs.get('force_bytes_to_unicode', False))
201+
# Try to check if force_bytes_to_unicode is set in kwargs else use the config value (which defaults to False)
202+
force_bytes_to_unicode = kwargs.get('force_bytes_to_unicode', FORCE_BYTES_TO_UNICODE)
203+
return self.SERIALIZER.deserialize(item, force_bytes_to_unicode=force_bytes_to_unicode)
201204

202205
def read_options(self):
203206
return super(PandasDataFrameStore, self).read_options()

0 commit comments

Comments
 (0)