Skip to content

Commit

Permalink
version bump, collections.Mapping import
Browse files Browse the repository at this point in the history
  • Loading branch information
willmcgugan committed Nov 10, 2018
1 parent 8c280c2 commit 335e40b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).


## [2.1.2] - 20180-11-10

### Added

- Support for Windows NT FTP servers @sspross


### Fixed

- Root dir of MemoryFS accesible as a file
- Packaging issues @televi
- Deprecation warning re collections.Mapping


## [2.1.1] - 2018-10-03

### Added
Expand All @@ -15,7 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- Fixed lstat @kamomil
- Fixed lstat @kamomil

## [2.1.0] - 2018-08-12

Expand Down
2 changes: 1 addition & 1 deletion fs/_version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Version, used in module and setup.py.
"""
__version__ = "2.1.2a0"
__version__ = "2.1.2"
9 changes: 7 additions & 2 deletions fs/error_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@
import typing
from contextlib import contextmanager

from six import reraise
from six import reraise, PY3

from . import errors

if False: # typing.TYPE_CHECKING
from types import TracebackType
from typing import Iterator, Optional, Mapping, Text, Type, Union

if PY3:
from collections.abc import Mapping
else:
from collections import Mapping


_WINDOWS_PLATFORM = platform.system() == "Windows"

Expand Down Expand Up @@ -107,7 +112,7 @@ def unwrap_errors(path_replace):
yield
except errors.ResourceError as e:
if hasattr(e, "path"):
if isinstance(path_replace, collections.Mapping):
if isinstance(path_replace, Mapping):
e.path = path_replace.get(e.path, e.path)
else:
e.path = path_replace
Expand Down

0 comments on commit 335e40b

Please sign in to comment.