Fix a few xfailed tests (geopandas#574)

* Fix some tests in geodataframe

* fix GeoSeries.astype(str)

* respond to comments

Author: mrocklin

geopandas/_block.py

@@ -151,10 +151,15 @@ def _astype(self, dtype, copy=False, errors='raise', values=None,
         raise on an except if raise == True
         """
 
-        if dtype != np.object_:
+        if dtype == np.object_:
+            values = self.to_dense()
+        elif dtype == str:
+            values = np.array(list(map(str, self.to_dense())))
+        else:
             if errors == 'raise':
                 raise TypeError('cannot astype geometries')
-        values = self.values
+            else:
+                values = self.to_dense()
 
         if copy:
             values = values.copy()

geopandas/geodataframe.py

@@ -65,7 +65,10 @@ def __init__(self, *args, **kwargs):
         crs = kwargs.pop('crs', None)
 
         geometry = kwargs.pop('geometry', 'geometry')
-        [arg] = args
+        if not args:
+            arg = []
+        else:
+            [arg] = args
 
         if isinstance(arg, BlockManager):
             super(GeoDataFrame, self).__init__(arg, **kwargs)
@@ -173,7 +176,8 @@ def set_geometry(self, col, drop=False, inplace=False, crs=None):
         Set the GeoDataFrame geometry using either an existing column or
         the specified input. By default yields a new object.
 
-        The original geometry column is replaced with the input.
+        The original geometry column is replaced with the input.  The geometry
+        column will have the same name as the selected column.
 
         Parameters
         ----------
@@ -195,7 +199,6 @@ def set_geometry(self, col, drop=False, inplace=False, crs=None):
         Returns
         -------
         geodataframe : GeoDataFrame
-
         """
         if inplace:
             frame = self

geopandas/tests/test_geodataframe.py

@@ -489,8 +489,6 @@ def test_from_postgis_custom_geom_col(self):
 
         validate_boro_df(df, case_sensitive=False)
 
-    @pytest.mark.cython
-    @pytest.mark.xfail(reason="GEOPANDAS-CYTHON")
     def test_dataframe_to_geodataframe(self):
         df = pd.DataFrame({"A": range(len(self.df)), "location":
                            list(self.df.geometry)}, index=self.df.index)
@@ -504,9 +502,8 @@ def test_dataframe_to_geodataframe(self):
         gf2 = df.set_geometry('location', crs=self.df.crs, drop=True)
         assert isinstance(df, pd.DataFrame)
         assert isinstance(gf2, GeoDataFrame)
-        assert gf2.geometry.name == 'geometry'
-        assert 'geometry' in gf2
-        assert 'location' not in gf2
+        assert gf2.geometry.name == 'location'
+        assert 'location' in gf2
         assert 'location' in df
 
         # should be a copy
@@ -694,7 +691,6 @@ def test_from_frame_specified_geometry(self):
             df.geometry
 
     @pytest.mark.cython
-    @pytest.mark.xfail(reason="GEOPANDAS-CYTHON")
     def test_only_geometry(self):
         df = GeoDataFrame(geometry=[Point(x, x) for x in range(3)])
         check_geodataframe(df)
@@ -716,7 +712,6 @@ def test_without_geometries(self):
         assert list(gdf.x) == [1]
 
     @pytest.mark.cython
-    @pytest.mark.xfail(reason="GEOPANDAS-CYTHON")
     def test_empty(self):
         df = GeoDataFrame()
         assert type(df) == GeoDataFrame

geopandas/tests/test_pandas_methods.py

@@ -109,9 +109,7 @@ def test_assign(df):
 
 
 @pytest.mark.cython
-@pytest.mark.xfail(reason="GEOPANDAS-CYTHON")
 def test_astype(s):
-
     with pytest.raises(TypeError):
         s.astype(int)
 

geopandas/vectorized.pyx

@@ -127,7 +127,7 @@ cpdef from_shapely(object L):
             try:
                 geos_geom = <np.uintp_t> g.__geom__
             except AttributeError:
-                msg = ("Inputs to from_shapely must be shapely eometries. "
+                msg = ("Inputs to from_shapely must be shapely geometries. "
                        "Got %s" % str(g))
                 raise TypeError(msg)
             geom = GEOSGeom_clone_r(handle, <GEOSGeometry *> geos_geom)  # create a copy rather than deal with gc