|
1 | | -# Copyright (c) 2015,2016,2017 MetPy Developers. |
| 1 | +# Copyright (c) 2015,2016,2017,2019 MetPy Developers. |
2 | 2 | # Distributed under the terms of the BSD 3-Clause License. |
3 | 3 | # SPDX-License-Identifier: BSD-3-Clause |
4 | 4 | """Tools to process GINI-formatted products.""" |
|
19 | 19 | try: |
20 | 20 | from xarray import Variable |
21 | 21 | from xarray.backends.common import AbstractDataStore |
22 | | - from xarray.core.utils import FrozenOrderedDict |
| 22 | + try: |
| 23 | + from xarray.core.utils import FrozenOrderedDict as FrozenDict |
| 24 | + except ImportError: |
| 25 | + from xarray.core.utils import FrozenDict |
23 | 26 | except ImportError: |
24 | 27 | # This way GiniFile is still usable without xarray |
25 | 28 | AbstractDataStore = object |
@@ -403,21 +406,21 @@ def get_variables(self): |
403 | 406 | attrs=attrs) |
404 | 407 | variables.append((name, data_var)) |
405 | 408 |
|
406 | | - return FrozenOrderedDict(variables) |
| 409 | + return FrozenDict(variables) |
407 | 410 |
|
408 | 411 | def get_attrs(self): |
409 | 412 | """Get the global attributes. |
410 | 413 |
|
411 | 414 | This is used by `xarray.open_dataset`. |
412 | 415 |
|
413 | 416 | """ |
414 | | - return FrozenOrderedDict(satellite=self.prod_desc.creating_entity, |
415 | | - sector=self.prod_desc.sector_id) |
| 417 | + return FrozenDict(satellite=self.prod_desc.creating_entity, |
| 418 | + sector=self.prod_desc.sector_id) |
416 | 419 |
|
417 | 420 | def get_dimensions(self): |
418 | 421 | """Get the file's dimensions. |
419 | 422 |
|
420 | 423 | This is used by `xarray.open_dataset`. |
421 | 424 |
|
422 | 425 | """ |
423 | | - return FrozenOrderedDict(x=self.prod_desc.nx, y=self.prod_desc.ny) |
| 426 | + return FrozenDict(x=self.prod_desc.nx, y=self.prod_desc.ny) |
0 commit comments