Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions pandas/core/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@

import itertools

try:
next
except NameError: # pragma: no cover
# Python < 2.6
def next(x):
return x.next()

from numpy.lib.format import read_array, write_array
import numpy as np

Expand Down
2 changes: 0 additions & 2 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import with_statement

"""
DataFrame
---------
Expand Down
7 changes: 0 additions & 7 deletions pandas/io/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
from urlparse import urlparse
import csv

try:
next
except NameError: # pragma: no cover
# Python < 2.6
def next(x):
return x.next()

import numpy as np

from pandas.core.index import Index, MultiIndex
Expand Down
3 changes: 0 additions & 3 deletions pandas/io/tests/test_pytables.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import with_statement

import nose
import unittest
import os
Expand Down Expand Up @@ -723,4 +721,3 @@ def _test_sort(obj):
import nose
nose.runmodule(argv=[__file__,'-vvs','-x','--pdb', '--pdb-failure'],
exit=False)

1 change: 0 additions & 1 deletion pandas/tests/test_common.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import with_statement
from datetime import datetime
import sys

Expand Down
6 changes: 2 additions & 4 deletions pandas/tests/test_graphics.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import with_statement

import nose
import os
import string
Expand Down Expand Up @@ -460,9 +458,9 @@ def test_parallel_coordinates(self):
path = os.path.join(curpath(), 'data/iris.csv')
df = read_csv(path)
_check_plot_works(parallel_coordinates, df, 'Name')
_check_plot_works(parallel_coordinates, df, 'Name',
_check_plot_works(parallel_coordinates, df, 'Name',
colors=('#556270', '#4ECDC4', '#C7F464'))
_check_plot_works(parallel_coordinates, df, 'Name',
_check_plot_works(parallel_coordinates, df, 'Name',
colors=['dodgerblue', 'aquamarine', 'seagreen'])

@slow
Expand Down
1 change: 0 additions & 1 deletion pandas/tseries/tests/test_timeseries.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# pylint: disable-msg=E1101,W0612
from __future__ import with_statement # for Python 2.5
import pandas.util.compat as itertools
from datetime import datetime, time, timedelta
import sys
Expand Down
1 change: 0 additions & 1 deletion pandas/tseries/tests/test_timezones.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# pylint: disable-msg=E1101,W0612
from __future__ import with_statement # for Python 2.5
from datetime import datetime, time, timedelta, tzinfo
import sys
import os
Expand Down
11 changes: 1 addition & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py25, py26, py27, py31, py32
envlist = py26, py27, py31, py32

[testenv]
deps =
Expand Down Expand Up @@ -35,15 +35,6 @@ commands =
# tox should provide a preinstall-commands hook.
pip uninstall pandas -qy


[testenv:py25]
deps =
cython
numpy >= 1.6.1
nose
pytz
simplejson

[testenv:py26]

[testenv:py27]
Expand Down
11 changes: 1 addition & 10 deletions tox_prll.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py25, py26, py27, py31, py32
envlist = py26, py27, py31, py32
sdistsrc = {env:DISTFILE}

[testenv]
Expand Down Expand Up @@ -36,15 +36,6 @@ commands =
# tox should provide a preinstall-commands hook.
pip uninstall pandas -qy


[testenv:py25]
deps =
cython
numpy >= 1.6.1
nose
pytz
simplejson

[testenv:py26]

[testenv:py27]
Expand Down