Skip to content

Commit 5fdae30

Browse files
committed
BLD: fix setup.py on py3 and py3-compatible relative imports
1 parent d65c5c0 commit 5fdae30

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

pandas/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import numpy as np
88

99
try:
10-
import hashtable
11-
import tslib
12-
import lib
10+
from . import hashtable, tslib, lib
1311
except Exception: # pragma: no cover
1412
import sys
1513
e = sys.exc_info()[1] # Py25 and Py3 current exception syntax conflict

pandas/hashtable.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cnp.import_ufunc()
1818

1919
cdef int64_t iNaT = util.get_nat()
2020

21-
import algos
21+
from . import algos
2222

2323
cdef extern from "datetime.h":
2424
bint PyDateTime_Check(object o)

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ def pxd(name):
597597

598598
extensions = []
599599

600-
for name, data in ext_data.iteritems():
600+
for name, data in ext_data.items():
601601
sources = [srcpath(data['pyxfile'], suffix=suffix, subdir='')]
602602
pxds = [pxd(x) for x in data.get('pxdfiles', [])]
603603
if suffix == '.pyx' and pxds:

0 commit comments

Comments
 (0)