Skip to content

consolidated the duplicate definitions of NA values (in parsers & IO) #16589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 13, 2017
Merged

consolidated the duplicate definitions of NA values (in parsers & IO) #16589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bc6752a
consolidated the duplicate definitions of NA values (in parsers & IO)
OlegShteynbuk Jun 3, 2017
0650da0
consolidated the duplicate definitions of NA values in parsers.pyx
OlegShteynbuk Jun 3, 2017
b0c1d4d
added blank lines - E302 expected 2 blank lines, found 1 in parsers.pyx
OlegShteynbuk Jun 3, 2017
1f0a350
added pesky blank lines - E302 expected 2 blank lines, found 1 in par…
OlegShteynbuk Jun 3, 2017
0579460
added pesky blank lines - E302 expected 2 blank lines, found 1 in par…
OlegShteynbuk Jun 3, 2017
6225c7c
changed to using existing function _ensure_encoded in parsers.pyx
OlegShteynbuk Jun 5, 2017
a7e7f01
reverted na_values.py back to using assert
OlegShteynbuk Jun 5, 2017
dc9a368
fixing typo
OlegShteynbuk Jun 5, 2017
e8f6e82
convert set to list
OlegShteynbuk Jun 5, 2017
5770506
put definition before reference
OlegShteynbuk Jun 5, 2017
5fa829e
import _NA_VALUES from common instead of parsers, make import explicit
OlegShteynbuk Jun 5, 2017
c499448
in import replace common with com
OlegShteynbuk Jun 5, 2017
03a335b
remove duplicate na values in in io.rst
OlegShteynbuk Jun 7, 2017
10cba2c
improved text related to na values in io.rst file
OlegShteynbuk Jun 9, 2017
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
Prev Previous commit
Next Next commit
import _NA_VALUES from common instead of parsers, make import explicit
  • Loading branch information
@OlegShteynbuk
OlegShteynbuk committed Jun 13, 2017
commit 5fa829eb3e4eeaa76909e936038e8bdf9f7cd79c
4 changes: 2 additions & 2 deletions pandas/_libs/parsers.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ from pandas.core.algorithms import take_1d
from pandas.core.dtypes.concat import union_categoricals
from pandas import Index

import pandas.io.parsers as parsers
import pandas.io.common as common

import time
import os
Expand Down Expand Up @@ -1378,7 +1378,7 @@ cdef asbytes(object o):
# common NA values
# no longer excluding inf representations
# '1.#INF','-1.#INF', '1.#INF000000',
_NA_VALUES = _ensure_encoded(list(parsers._NA_VALUES))
_NA_VALUES = _ensure_encoded(list(common._NA_VALUES))


def _is_file_like(obj):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/parser/na_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import numpy as np
from numpy import nan

import pandas.io.parsers as parsers
import pandas.io.common as common
import pandas.util.testing as tm

from pandas import DataFrame, Index, MultiIndex
Expand Down Expand Up @@ -72,7 +72,7 @@ def test_default_na_values(self):
_NA_VALUES = set(['-1.#IND', '1.#QNAN', '1.#IND', '-1.#QNAN',
'#N/A', 'N/A', 'n/a', 'NA', '#NA', 'NULL', 'null',
'NaN', 'nan', '-NaN', '-nan', '#N/A N/A', ''])
assert _NA_VALUES == parsers._NA_VALUES
assert _NA_VALUES == common._NA_VALUES
nv = len(_NA_VALUES)

def f(i, v):
Expand Down