Removed commented code

This commit is contained in:
Sean C. Gillies 2018-05-11 12:29:55 -06:00
parent 58b95de29b
commit 016d173ee5
2 changed files with 0 additions and 7 deletions

View File

@ -247,7 +247,6 @@ class Env(object):
local._discovered_options = {}
# Don't want to reinstate the "RASTERIO_ENV" option.
probe_env = {k for k in self.options.keys() if k != "RASTERIO_ENV"}
# probe_env |= set(self.options.keys())
for key in probe_env:
val = get_gdal_config(key, normalize=False)
if val is not None:
@ -293,11 +292,6 @@ def defenv(**options):
else:
log.debug("No GDAL environment exists")
local._env = GDALEnv()
# first set default options, then add user options
# set_options = {}
# for d in (default_options, options):
# for (k, v) in d.items():
# set_options[k] = v
local._env.update_config_options(**options)
log.debug(
"New GDAL environment %r created", local._env)

View File

@ -10,7 +10,6 @@ import pytest
import rasterio
from rasterio._env import del_gdal_config, get_gdal_config, set_gdal_config
from rasterio.env import Env, defenv, delenv, getenv, setenv, ensure_env
# from rasterio.env import default_options, GDALVersion, require_gdal_version
from rasterio.env import GDALVersion, require_gdal_version
from rasterio.errors import EnvError, RasterioIOError, GDALVersionError
from rasterio.rio.main import main_group