archive-gh-me/rasterio
1
0
Fork 0
mirror of https://github.com/rasterio/rasterio.git synced 2025-12-08 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove window_shape from __init__.py

Browse Source
This commit is contained in:
vincentsarago 2018-04-11 10:51:01 -04:00
parent 5fa43b12f0
commit acaaa0e67f
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rasterio/__init__.py
View File

@ -39,13 +39,6 @@ from rasterio.vfs import parse_path
from rasterio import _err, coords, enums, vfs
def window_shape(*args, **kwargs):
from rasterio.windows import shape
warnings.warn(
"Deprecated; Use rasterio.windows instead", RasterioDeprecationWarning)
return shape(*args, **kwargs)
def window_index(*args, **kwargs):
from rasterio.windows import window_index
warnings.warn(

14
tests/test_blocks.py
View File

@ -19,28 +19,28 @@ class WindowTest(unittest.TestCase):
def test_window_shape_None_start(self):
self.assertEqual(
rasterio.window_shape(((None, 4), (None, 102))),
rasterio.windows.shape(((None, 4), (None, 102))),
(4, 102))
def test_window_shape_None_stop(self):
self.assertEqual(
rasterio.window_shape(((10, None), (10, None)), 100, 90),
rasterio.windows.shape(((10, None), (10, None)), 100, 90),
(90, 80))
def test_window_shape_positive(self):
self.assertEqual(
rasterio.window_shape(((0, 4), (1, 102))),
rasterio.windows.shape(((0, 4), (1, 102))),
(4, 101))
def test_window_shape_negative(self):
self.assertEqual(
rasterio.window_shape(((-10, None), (-10, None)), 100, 90),
rasterio.windows.shape(((-10, None), (-10, None)), 100, 90),
(10, 10))
self.assertEqual(
rasterio.window_shape(((~0, None), (~0, None)), 100, 90),
rasterio.windows.shape(((~0, None), (~0, None)), 100, 90),
(1, 1))
self.assertEqual(
rasterio.window_shape(((None, ~0), (None, ~0)), 100, 90),
rasterio.windows.shape(((None, ~0), (None, ~0)), 100, 90),
(99, 89))
def test_eval(self):
@ -102,7 +102,7 @@ class WindowReadTest(unittest.TestCase):
self.assertEqual(first_block.dtype, rasterio.ubyte)
self.assertEqual(
first_block.shape,
rasterio.window_shape(first_window))
rasterio.windows.shape(first_window))
class WindowWriteTest(unittest.TestCase):