Skip to content

Commit

Permalink
Updated range/xrange calls to be compatible with Python 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbeced
gbeced committed Jul 28, 2018
1 parent f0567b0 commit 75117b4
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions testcases/dataseries_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def testEmpty(self):

def testNonEmpty(self):
ds = dataseries.SequenceDataSeries()
for value in range(10):
for value in xrange(10):
ds.append(value)
self.assertTrue(len(ds) == 10)
self.assertTrue(ds[-1] == 9)
Expand All @@ -64,7 +64,7 @@ def testNonEmpty(self):
self.assertTrue(ds[9:] == [9])

def testSeqLikeOps(self):
seq = range(10)
seq = list(xrange(10))
ds = dataseries.SequenceDataSeries()
for value in seq:
ds.append(value)
Expand Down Expand Up @@ -155,7 +155,7 @@ def testEmpty(self):

def testAppendInvalidDatetime(self):
ds = bards.BarDataSeries()
for i in range(10):
for i in xrange(10):
now = datetime.datetime.now() + datetime.timedelta(seconds=i)
ds.append(bar.BasicBar(now, 0, 0, 0, 0, 0, 0, bar.Frequency.SECOND))
# Adding the same datetime twice should fail
Expand All @@ -167,19 +167,19 @@ def testAppendInvalidDatetime(self):

def testNonEmpty(self):
ds = bards.BarDataSeries()
for i in range(10):
for i in xrange(10):
ds.append(bar.BasicBar(datetime.datetime.now() + datetime.timedelta(seconds=i), 0, 0, 0, 0, 0, 0, bar.Frequency.SECOND))

for i in range(0, 10):
for i in xrange(0, 10):
self.assertTrue(ds[i].getOpen() == 0)

def __testGetValue(self, ds, itemCount, value):
for i in range(0, itemCount):
for i in xrange(0, itemCount):
self.assertTrue(ds[i] == value)

def testNestedDataSeries(self):
ds = bards.BarDataSeries()
for i in range(10):
for i in xrange(10):
ds.append(bar.BasicBar(datetime.datetime.now() + datetime.timedelta(seconds=i), 2, 4, 1, 3, 10, 3, bar.Frequency.SECOND))

self.__testGetValue(ds.getOpenDataSeries(), 10, 2)
Expand All @@ -193,7 +193,7 @@ def testNestedDataSeries(self):
def testSeqLikeOps(self):
seq = []
ds = bards.BarDataSeries()
for i in range(10):
for i in xrange(10):
bar_ = bar.BasicBar(datetime.datetime.now() + datetime.timedelta(seconds=i), 2, 4, 1, 3, 10, 3, bar.Frequency.SECOND)
ds.append(bar_)
seq.append(bar_)
Expand All @@ -207,10 +207,10 @@ def testSeqLikeOps(self):
def testDateTimes(self):
ds = bards.BarDataSeries()
firstDt = datetime.datetime.now()
for i in range(10):
for i in xrange(10):
ds.append(bar.BasicBar(firstDt + datetime.timedelta(seconds=i), 2, 4, 1, 3, 10, 3, bar.Frequency.SECOND))

for i in range(10):
for i in xrange(10):
self.assertEqual(ds[i].getDateTime(), ds.getDateTimes()[i])
self.assertEqual(ds.getDateTimes()[i], firstDt + datetime.timedelta(seconds=i))

Expand All @@ -223,7 +223,7 @@ def testNotAligned(self):
ads1, ads2 = aligned.datetime_aligned(ds1, ds2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
if i % 2 == 0:
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
else:
Expand All @@ -243,15 +243,15 @@ def testFullyAligned(self):
ads1, ads2 = aligned.datetime_aligned(ds1, ds2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
ds2.appendWithDateTime(now + datetime.timedelta(seconds=i), i)

self.assertEqual(len(ds1), len(ds2))

for ads in [ads1, ads2]:
self.assertEqual(len(ads), size)
for i in range(size):
for i in xrange(size):
self.assertEqual(ads.getValueAbsolute(i), i)
self.assertEqual(ads.getDateTimes()[i], now + datetime.timedelta(seconds=i))

Expand All @@ -263,7 +263,7 @@ def testPartiallyAligned(self):
ads1, ads2 = aligned.datetime_aligned(ds1, ds2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
if i % 3 == 0:
commonDateTimes.append(now + datetime.timedelta(seconds=i))
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
Expand All @@ -285,7 +285,7 @@ def testIncremental(self):
ads1, ads2 = aligned.datetime_aligned(ds1, ds2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
ds2.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
self.assertEqual(len(ads1), len(ads2))
Expand All @@ -301,7 +301,7 @@ def testNotAligned_Recursive(self):
ads1, ads2 = aligned.datetime_aligned(ads1, ads2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
if i % 2 == 0:
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
else:
Expand All @@ -323,15 +323,15 @@ def testFullyAligned_Recursive(self):
ads1, ads2 = aligned.datetime_aligned(ads1, ads2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
ds2.appendWithDateTime(now + datetime.timedelta(seconds=i), i)

self.assertEqual(len(ds1), len(ds2))

for ads in [ads1, ads2]:
self.assertEqual(len(ads), size)
for i in range(size):
for i in xrange(size):
self.assertEqual(ads.getValueAbsolute(i), i)
self.assertEqual(ads.getDateTimes()[i], now + datetime.timedelta(seconds=i))

Expand All @@ -345,7 +345,7 @@ def testPartiallyAligned_Recursive(self):
ads1, ads2 = aligned.datetime_aligned(ads1, ads2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
if i % 3 == 0:
commonDateTimes.append(now + datetime.timedelta(seconds=i))
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
Expand All @@ -369,7 +369,7 @@ def testIncremental_Recursive(self):
ads1, ads2 = aligned.datetime_aligned(ads1, ads2)

now = datetime.datetime.now()
for i in range(size):
for i in xrange(size):
ds1.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
ds2.appendWithDateTime(now + datetime.timedelta(seconds=i), i)
self.assertEqual(len(ads1), len(ads2))
Expand Down Expand Up @@ -419,7 +419,7 @@ def tearDown(self):

def testMaxLen(self):
ds = dataseries.SequenceDataSeries()
for i in range(3000):
for i in xrange(3000):
ds.append(i)
self.assertEqual(len(ds), 2048)
self.assertEqual(ds[0], 952)
Expand Down

0 comments on commit 75117b4

Please sign in to comment.