Skip to content

Commit

Permalink
Merge pull request #50 from adrian17/master
Browse files Browse the repository at this point in the history
Use absolute imports
  • Loading branch information
EntilZha committed Nov 8, 2015
2 parents 3c67485 + b16cba5 commit 51a4948
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 15 deletions.
4 changes: 3 additions & 1 deletion functional/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
Package for creating data pipelines, LINQ-style data analysis, and functional programming. Imports
the primary entrypoint at streams.seq
"""
from .streams import seq
from __future__ import absolute_import

from functional.streams import seq

__author__ = "Pedro Rodriguez"
__copyright__ = "Copyright 2015, Pedro Rodriguez"
Expand Down
6 changes: 4 additions & 2 deletions functional/lineage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from .transformations import CACHE_T
from .transformations import ExecutionStrategies
from __future__ import absolute_import

from functional.transformations import CACHE_T
from functional.transformations import ExecutionStrategies


class Lineage(object):
Expand Down
8 changes: 4 additions & 4 deletions functional/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The pipeline module contains the primary data structure Sequence and entry point seq
"""

from __future__ import division
from __future__ import division, absolute_import
from operator import mul
import collections
from functools import reduce
Expand All @@ -13,9 +13,9 @@
import csv
import future.builtins as builtins

from .lineage import Lineage
from .util import is_iterable, is_primitive, identity, CSV_WRITE_MODE
from . import transformations
from functional.lineage import Lineage
from functional.util import is_iterable, is_primitive, identity, CSV_WRITE_MODE
from functional import transformations


class Sequence(object):
Expand Down
5 changes: 3 additions & 2 deletions functional/streams.py
Original file line number Diff line number Diff line change
@@ -1,12 +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 six
from .pipeline import Sequence
from .util import is_primitive, ReusableFile
from functional.pipeline import Sequence
from functional.util import is_primitive, ReusableFile


def seq(*args):
Expand Down
7 changes: 4 additions & 3 deletions functional/test/test_functional.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#pylint: skip-file
from __future__ import absolute_import

import unittest
from collections import namedtuple
from ..pipeline import Sequence, is_iterable, _wrap
from ..transformations import name
from .. import seq
from functional.pipeline import Sequence, is_iterable, _wrap
from functional.transformations import name
from functional import seq

Data = namedtuple('Data', 'x y')

Expand Down
4 changes: 3 additions & 1 deletion functional/test/test_streams.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from __future__ import absolute_import

import unittest
import six
from .. import seq
from functional import seq


class TestStreams(unittest.TestCase):
Expand Down
4 changes: 3 additions & 1 deletion functional/test/test_util.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from __future__ import absolute_import

import unittest
from ..util import ReusableFile
from functional.util import ReusableFile


class TestUtil(unittest.TestCase):
Expand Down
3 changes: 2 additions & 1 deletion functional/transformations.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# 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
Expand All @@ -8,7 +9,7 @@
import types
import six

from .util import filterfalse
from functional.util import filterfalse


#: Defines a Transformation from a name, function, and execution_strategies
Expand Down
2 changes: 2 additions & 0 deletions functional/util.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# pylint: disable=no-name-in-module,unused-import

from __future__ import absolute_import

import collections
import six
import future.builtins as builtins
Expand Down

0 comments on commit 51a4948

Please sign in to comment.