Skip to content

Commit

Permalink
Fix new pylint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
EntilZha committed Dec 7, 2015
1 parent 06d30e2 commit a683879
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
5 changes: 4 additions & 1 deletion functional/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
"""

from __future__ import division, absolute_import

from operator import mul
import collections
from functools import reduce
import six

import json
import csv

import six
import future.builtins as builtins

from functional.lineage import Lineage
Expand Down
4 changes: 3 additions & 1 deletion functional/streams.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# pylint: disable=redefined-builtin,too-many-arguments
from __future__ import absolute_import

import future.builtins as builtins
import re
import csv as csvapi
import json as jsonapi

import future.builtins as builtins
import six

from functional.pipeline import Sequence
from functional.util import is_primitive, ReusableFile

Expand Down
12 changes: 6 additions & 6 deletions functional/test/test_streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ def test_csv(self):
seq.csv(1)

def test_jsonl(self):
result = seq.jsonl('functional/test/data/test.jsonl').to_list()
expect = [[1, 2, 3], {'a': 1, 'b': 2, 'c': 3}]
self.assertEqual(expect, result)
result = seq.jsonl(['[1, 2, 3]', '[4, 5, 6]'])
expect = [[1, 2, 3], [4, 5, 6]]
self.assertEqual(expect, result)
result_0 = seq.jsonl('functional/test/data/test.jsonl').to_list()
expect_0 = [[1, 2, 3], {'a': 1, 'b': 2, 'c': 3}]
self.assertEqual(expect_0, result_0)
result_1 = seq.jsonl(['[1, 2, 3]', '[4, 5, 6]'])
expect_1 = [[1, 2, 3], [4, 5, 6]]
self.assertEqual(expect_1, result_1)

def test_json(self):
list_test_path = 'functional/test/data/test_list.json'
Expand Down
10 changes: 5 additions & 5 deletions functional/transformations.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# pylint: disable=redefined-builtin,missing-docstring,no-member,invalid-name
from __future__ import absolute_import

from future.builtins import map, filter, zip, range
from functools import reduce, partial
from itertools import dropwhile, takewhile, islice

import collections
import types
import six

from functional.util import filterfalse
from future.builtins import map, filter, zip, range

import six


#: Defines a Transformation from a name, function, and execution_strategies
Expand Down Expand Up @@ -84,7 +83,8 @@ def filter_not_t(func):
:param func: filter_not function
:return: transformation
"""
return Transformation('filter_not({0})'.format(name(func)), partial(filterfalse, func), None)
return Transformation('filter_not({0})'.format(name(func)),
partial(six.moves.filterfalse, func), None)


def reversed_t():
Expand Down
2 changes: 0 additions & 2 deletions functional/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import future.builtins as builtins

if six.PY2:
from itertools import ifilterfalse as filterfalse
CSV_WRITE_MODE = 'wb'
else:
from itertools import filterfalse
CSV_WRITE_MODE = 'w'


Expand Down

0 comments on commit a683879

Please sign in to comment.