Skip to content

Commit

Permalink
changes to prevent deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanvg committed Nov 16, 2020
1 parent 85230e1 commit ec6dfaf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def get_long_description():
url="https://github.com/mitre/stixmarx",
packages=find_packages(),
install_requires=[
"stix>=1.1.1.8,<1.2.1.0"
"stix>=1.1.1.19,<1.2.1.0"
],
license="BSD",
classifiers=[
Expand Down
11 changes: 9 additions & 2 deletions stixmarx/markingmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,19 @@

# stdlib
import logging
import collections

# external
from mixbox.vendor.six import PY2, PY3

# internal
from stixmarx import xml


if PY2:
from collections import MutableMapping
elif PY3:
from collections.abc import MutableMapping

# Module-level logger
LOG = logging.getLogger(__name__)

Expand Down Expand Up @@ -86,7 +93,7 @@ def __hash__(self):
return hash((self.name, self.sourcenode, self.parent))


class MarkingMap(collections.MutableMapping):
class MarkingMap(MutableMapping):
def __init__(self, encoding=None):
self._inner = {}
self._encoding = encoding
Expand Down

0 comments on commit ec6dfaf

Please sign in to comment.