From 4db5e6c1429b98904ce907177132dbe8318c3585 Mon Sep 17 00:00:00 2001 From: jfkirk Date: Wed, 16 Sep 2015 16:34:34 -0400 Subject: [PATCH] ENH: AssetDBWriter now overwrites symbol with file_name, if provided --- zipline/assets/asset_writer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zipline/assets/asset_writer.py b/zipline/assets/asset_writer.py index 309bd110..c11142e7 100644 --- a/zipline/assets/asset_writer.py +++ b/zipline/assets/asset_writer.py @@ -63,7 +63,6 @@ _equities_defaults = { 'end_date': 2 ** 62 - 1, 'first_traded': None, 'exchange': None, - 'fuzzy': None, } # Default values for the futures DataFrame @@ -308,7 +307,6 @@ class AssetDBWriter(with_metaclass(ABCMeta)): sa.Column('end_date', sa.Integer), sa.Column('first_traded', sa.Integer), sa.Column('exchange', sa.Text), - sa.Column('fuzzy', sa.Text), ) self.futures_exchanges = sa.Table( 'futures_exchanges', @@ -405,6 +403,8 @@ class AssetDBWriter(with_metaclass(ABCMeta)): if ('company_name' in data.equities.columns) \ and ('asset_name' not in data.equities.columns): data.equities['asset_name'] = data.equities['company_name'] + if ('file_name' in data.equities.columns): + data.equities['symbol'] = data.equities['file_name'] equities_output = _generate_output_dataframe( data_subset=data.equities,