wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-06-30 09:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: Updated iteritems for python3 compatibility

Browse Source
This commit is contained in:
Delaney Granizo-Mackenzie
2015-03-05 14:05:24 -05:00
parent b095f09472
commit f6f69e9106
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipline/finance/blotter.py
+2 -2
View File
@@ -19,7 +19,7 @@ from copy import copy
from logbook import Logger
from collections import defaultdict
from six import text_type
from six import text_type, iteritems
from six.moves import filter
import zipline.errors
@@ -423,7 +423,7 @@ class Order(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
state_dict['_status'] = self._status
zipline/finance/commission.py
+5 -3
View File
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from six import iteritems
from zipline.utils.serialization_utils import (
VERSION_LABEL
)
@@ -57,7 +59,7 @@ class PerShare(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
STATE_VERSION = 1
@@ -105,7 +107,7 @@ class PerTrade(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
STATE_VERSION = 1
@@ -153,7 +155,7 @@ class PerDollar(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
STATE_VERSION = 1
zipline/finance/performance/period.py
+1 -1
View File
@@ -581,7 +581,7 @@ class PerformancePeriod(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
state_dict['_portfolio_store'] = self._portfolio_store
zipline/finance/performance/tracker.py
+2 -1
View File
@@ -60,6 +60,7 @@ Performance Tracking
from __future__ import division
import logbook
import pickle
from six import iteritems
import numpy as np
import pandas as pd
@@ -490,7 +491,7 @@ class PerformanceTracker(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
state_dict['dividend_frame'] = pickle.dumps(self.dividend_frame)
zipline/finance/risk/cumulative.py
+1 -1
View File
@@ -461,7 +461,7 @@ algorithm_returns ({algo_count}) in range {start} : {end} on {dt}"
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems() if
{k: v for k, v in iteritems(self.__dict__) if
(not k.startswith('_') and not k == 'treasury_curves')}
STATE_VERSION = 1
zipline/finance/risk/period.py
+1 -1
View File
@@ -311,7 +311,7 @@ class RiskMetricsPeriod(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems() if
{k: v for k, v in iteritems(self.__dict__) if
(not k.startswith('_') and not k == 'treasury_curves')}
STATE_VERSION = 1
zipline/finance/risk/report.py
+2 -1
View File
@@ -58,6 +58,7 @@ Risk Report
import logbook
import datetime
from dateutil.relativedelta import relativedelta
from six import iteritems
from . period import RiskMetricsPeriod
@@ -145,7 +146,7 @@ class RiskReport(object):
def __getstate__(self):
state_dict = \
{k: v for k, v in self.__dict__.iteritems()
{k: v for k, v in iteritems(self.__dict__)
if not k.startswith('_')}
if '_dividend_count' in dir(self):