Use super instead of manually forwarding the call to upper class.

sylinuxhy · Apr 12, 2016 · 678da73 · 678da73
1 parent c17754a
commit 678da73
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 14 deletions.
diff --git a/pyalgotrade/barfeed/__init__.py b/pyalgotrade/barfeed/__init__.py
@@ -44,7 +44,7 @@ class BaseBarFeed(feed.BaseFeed):
     """
 
     def __init__(self, frequency, maxLen=None):
-        feed.BaseFeed.__init__(self, maxLen)
+        super(BaseBarFeed, self).__init__(maxLen)
         self.__frequency = frequency
         self.__useAdjustedValues = False
         self.__defaultInstrument = None
@@ -156,7 +156,7 @@ def getDispatchPriority(self):
 # and the bars are sent back to workers.
 class OptimizerBarFeed(BaseBarFeed):
     def __init__(self, frequency, instruments, bars, maxLen=None):
-        BaseBarFeed.__init__(self, frequency, maxLen)
+        super(OptimizerBarFeed, self).__init__(frequency, maxLen)
         for instrument in instruments:
             self.registerInstrument(instrument)
         self.__bars = bars

diff --git a/pyalgotrade/barfeed/csvfeed.py b/pyalgotrade/barfeed/csvfeed.py
@@ -95,7 +95,8 @@ class BarFeed(membf.BarFeed):
     """
 
     def __init__(self, frequency, maxLen=None):
-        membf.BarFeed.__init__(self, frequency, maxLen)
+        super(BarFeed, self).__init__(frequency, maxLen)
+
         self.__barFilter = None
         self.__dailyTime = datetime.time(0, 0, 0)
 
@@ -200,7 +201,8 @@ class GenericBarFeed(BarFeed):
     """
 
     def __init__(self, frequency, timezone=None, maxLen=None):
-        BarFeed.__init__(self, frequency, maxLen)
+        super(GenericBarFeed, self).__init__(frequency, maxLen)
+
         self.__timezone = timezone
         # Assume bars don't have adjusted close. This will be set to True after
         # loading the first file if the adj_close column is there.

diff --git a/pyalgotrade/barfeed/googlefeed.py b/pyalgotrade/barfeed/googlefeed.py
@@ -118,7 +118,8 @@ def __init__(self, frequency=bar.Frequency.DAY, timezone=None, maxLen=None):
         if frequency not in [bar.Frequency.DAY]:
             raise Exception("Invalid frequency.")
 
-        csvfeed.BarFeed.__init__(self, frequency, maxLen)
+        super(Feed, self).__init__(frequency, maxLen)
+
         self.__timezone = timezone
         self.__sanitizeBars = False
 

diff --git a/pyalgotrade/barfeed/membf.py b/pyalgotrade/barfeed/membf.py
@@ -32,7 +32,8 @@
 
 class BarFeed(barfeed.BaseBarFeed):
     def __init__(self, frequency, maxLen=None):
-        barfeed.BaseBarFeed.__init__(self, frequency, maxLen)
+        super(BarFeed, self).__init__(frequency, maxLen)
+
         self.__bars = {}
         self.__nextPos = {}
         self.__started = False

diff --git a/pyalgotrade/barfeed/ninjatraderfeed.py b/pyalgotrade/barfeed/ninjatraderfeed.py
@@ -120,7 +120,8 @@ def __init__(self, frequency, timezone=None, maxLen=None):
         if frequency not in [bar.Frequency.MINUTE, bar.Frequency.DAY]:
             raise Exception("Invalid frequency.")
 
-        csvfeed.BarFeed.__init__(self, frequency, maxLen)
+        super(Feed, self).__init__(frequency, maxLen)
+
         self.__timezone = timezone
 
     def barsHaveAdjClose(self):

diff --git a/pyalgotrade/barfeed/quandlfeed.py b/pyalgotrade/barfeed/quandlfeed.py
@@ -45,7 +45,7 @@ def __init__(self, frequency=bar.Frequency.DAY, timezone=None, maxLen=None):
         if frequency not in [bar.Frequency.DAY, bar.Frequency.WEEK]:
             raise Exception("Invalid frequency.")
 
-        csvfeed.GenericBarFeed.__init__(self, frequency, timezone, maxLen)
+        super(Feed, self).__init__(frequency, timezone, maxLen)
 
         self.setDateTimeFormat("%Y-%m-%d")
         self.setColumnName("datetime", "Date")

diff --git a/pyalgotrade/barfeed/resampled.py b/pyalgotrade/barfeed/resampled.py
@@ -52,7 +52,7 @@ def getGrouped(self):
 class ResampledBarFeed(barfeed.BaseBarFeed):
 
     def __init__(self, barFeed, frequency, maxLen=None):
-        barfeed.BaseBarFeed.__init__(self, frequency, maxLen)
+        super(ResampledBarFeed, self).__init__(frequency, maxLen)
 
         if not isinstance(barFeed, barfeed.BaseBarFeed):
             raise Exception("barFeed must be a barfeed.BaseBarFeed instance")

diff --git a/pyalgotrade/barfeed/sqlitefeed.py b/pyalgotrade/barfeed/sqlitefeed.py
@@ -141,7 +141,8 @@ def disconnect(self):
 
 class Feed(membf.BarFeed):
     def __init__(self, dbFilePath, frequency, maxLen=None):
-        membf.BarFeed.__init__(self, frequency, maxLen)
+        super(Feed, self).__init__(frequency, maxLen)
+
         self.__db = Database(dbFilePath)
 
     def barsHaveAdjClose(self):

diff --git a/pyalgotrade/barfeed/yahoofeed.py b/pyalgotrade/barfeed/yahoofeed.py
@@ -112,7 +112,8 @@ def __init__(self, frequency=bar.Frequency.DAY, timezone=None, maxLen=None):
         if frequency not in [bar.Frequency.DAY, bar.Frequency.WEEK]:
             raise Exception("Invalid frequency.")
 
-        csvfeed.BarFeed.__init__(self, frequency, maxLen)
+        super(Feed, self).__init__(frequency, maxLen)
+
         self.__timezone = timezone
         self.__sanitizeBars = False
 

diff --git a/pyalgotrade/feed/csvfeed.py b/pyalgotrade/feed/csvfeed.py
@@ -74,7 +74,8 @@ def includeRow(self, dateTime, values):
 
 class BaseFeed(memfeed.MemFeed):
     def __init__(self, rowParser, maxLen=None):
-        memfeed.MemFeed.__init__(self, maxLen)
+        super(BaseFeed, self).__init__(maxLen)
+
         self.__rowParser = rowParser
         self.__rowFilter = None
 
@@ -160,7 +161,8 @@ def __init__(self, dateTimeColumn, dateTimeFormat, converter=None, delimiter=","
         if converter is None:
             converter = float_or_string
         self.__rowParser = BasicRowParser(dateTimeColumn, dateTimeFormat, converter, delimiter, timezone)
-        BaseFeed.__init__(self, self.__rowParser, maxLen)
+
+        super(Feed, self).__init__(self.__rowParser, maxLen)
 
     def addValuesFromCSV(self, path):
         """Loads values from a file.

diff --git a/pyalgotrade/feed/memfeed.py b/pyalgotrade/feed/memfeed.py
@@ -24,7 +24,8 @@
 
 class MemFeed(feed.BaseFeed):
     def __init__(self, maxLen=None):
-        feed.BaseFeed.__init__(self, maxLen)
+        super(MemFeed, self).__init__(maxLen)
+
         self.__values = []
         self.__nextIdx = 0