From db675c18ea978b0ee175fe779e4d7c43b8b5c8b3 Mon Sep 17 00:00:00 2001 From: Kelsey Jordahl Date: Sat, 14 Sep 2013 12:12:52 -0400 Subject: [PATCH] CLN: Clean up imports. Use absolute imports. --- geopandas/geodataframe.py | 8 ++++---- geopandas/geoseries.py | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/geopandas/geodataframe.py b/geopandas/geodataframe.py index c36487a..8a511cd 100644 --- a/geopandas/geodataframe.py +++ b/geopandas/geodataframe.py @@ -1,14 +1,14 @@ from collections import defaultdict, OrderedDict -import json, os +import json +import os import fiona +import numpy as np from pandas import DataFrame from shapely.geometry import mapping, shape from geopandas import GeoSeries -from plotting import plot_dataframe - -import numpy as np +from geopandas.plotting import plot_dataframe class GeoDataFrame(DataFrame): diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py index 819278e..9085add 100644 --- a/geopandas/geoseries.py +++ b/geopandas/geoseries.py @@ -1,27 +1,24 @@ -from warnings import warn from functools import partial +from warnings import warn +import fiona +from fiona.crs import from_epsg import numpy as np from pandas import Series, DataFrame - import pyproj from shapely.geometry import shape, Polygon, Point from shapely.geometry.collection import GeometryCollection from shapely.geometry.base import BaseGeometry from shapely.ops import cascaded_union, unary_union, transform import shapely.affinity as affinity -import fiona -from fiona.crs import from_epsg -from plotting import plot_series +from geopandas.plotting import plot_series EMPTY_COLLECTION = GeometryCollection() EMPTY_POLYGON = Polygon() EMPTY_POINT = Point() - - def _is_empty(x): try: return x.is_empty