Skip to content
This repository was archived by the owner on Dec 21, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion storm/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
from storm import __version__

import sys
try:
import collections.abc as collections_abc
except ImportError:
import collections as collections_abc

def get_storm_instance(config_file=None):
return Storm(config_file)
Expand Down Expand Up @@ -224,7 +228,7 @@ def list(config=None):
result += " {0}".format(custom_options)
extra = True

if isinstance(value, collections.Sequence):
if isinstance(value, collections_abc.Sequence):
if isinstance(value, builtins.list):
value = ",".join(value)

Expand Down
7 changes: 5 additions & 2 deletions storm/kommandr.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
from itertools import izip_longest
except ImportError:
from itertools import zip_longest as izip_longest
import collections
try:
import collections.abc as collections_abc
except ImportError:
import collections as collections_abc

import six

Expand Down Expand Up @@ -95,7 +98,7 @@ def __init__(self, **kwargs):

def command(self, *args, **kwargs):
"""Convenient decorator simply creates corresponding command"""
if len(args) == 1 and isinstance(args[0], collections.Callable):
if len(args) == 1 and isinstance(args[0], collections_abc.Callable):
return self._generate_command(args[0])
else:
def _command(func):
Expand Down