Use Iterable instead of Sequence

oklahomer · Nov 8, 2015 · 3cc86f6 · 3cc86f6
1 parent 2199d20
commit 3cc86f6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/sarah/bot/base.py b/sarah/bot/base.py
@@ -11,7 +11,7 @@
 from functools import wraps
 
 from apscheduler.schedulers.background import BackgroundScheduler
-from typing import Sequence, Optional, Callable, Union
+from typing import Optional, Callable, Union, Iterable
 
 from sarah.bot.types import PluginConfig, AnyFunction, CommandFunction
 from sarah.bot.values import Command, CommandMessage, UserContext, \
@@ -25,7 +25,7 @@ class Base(object, metaclass=abc.ABCMeta):
     __instances = {}
 
     def __init__(self,
-                 plugins: Sequence[PluginConfig] = None,
+                 plugins: Iterable[PluginConfig] = None,
                  max_workers: Optional[int] = None) -> None:
         if not plugins:
             plugins = ()
@@ -247,7 +247,7 @@ def wrapped_function(*args, **kwargs) -> str:
 
         return wrapper
 
-    def add_schedule_jobs(self, commands: Sequence[ScheduledCommand]) -> None:
+    def add_schedule_jobs(self, commands: Iterable[ScheduledCommand]) -> None:
         for command in commands:
             # self.add_schedule_job(command)
             job_function = self.generate_schedule_job(command)

diff --git a/sarah/bot/slack.py b/sarah/bot/slack.py
@@ -5,7 +5,7 @@
 from concurrent.futures import Future
 
 import requests
-from typing import Optional, Dict, Sequence, Callable
+from typing import Optional, Dict, Callable, Iterable
 from websocket import WebSocketApp
 
 from sarah import ValueObject
@@ -85,7 +85,7 @@ def __init__(self,
                  author_name: str = None,
                  author_link: str = None,
                  author_icon: str = None,
-                 fields: Sequence[AttachmentField] = None,
+                 fields: Iterable[AttachmentField] = None,
                  image_url: str = None,
                  thumb_url: str = None,
                  pretext: str = None,
@@ -118,7 +118,7 @@ def __init__(self,
                  unfurl_media: bool = False,
                  icon_url: str = None,
                  icon_emoji: str = None,
-                 attachments: Sequence[MessageAttachment] = None):
+                 attachments: Iterable[MessageAttachment] = None):
         pass
 
     def __str__(self) -> str:
@@ -148,7 +148,7 @@ def to_request_params(self) -> Dict:
 class Slack(Base):
     def __init__(self,
                  token: str = '',
-                 plugins: Sequence[PluginConfig] = None,
+                 plugins: Iterable[PluginConfig] = None,
                  max_workers: int = None) -> None:
 
         super().__init__(plugins=plugins, max_workers=max_workers)

diff --git a/sarah/bot/values/__init__.py b/sarah/bot/values/__init__.py
@@ -2,7 +2,7 @@
 import abc
 import re
 
-from typing import Union, Pattern, AnyStr, Callable, Sequence, Dict
+from typing import Union, Pattern, AnyStr, Callable, Dict, Iterable
 
 from sarah import ValueObject
 from sarah.bot.types import CommandFunction, CommandConfig
@@ -37,7 +37,7 @@ class UserContext(ValueObject):
     def __init__(self,
                  message: Union[str, RichMessage],
                  help_message: str,
-                 input_options: Sequence[InputOption]) -> None:
+                 input_options: Iterable[InputOption]) -> None:
         pass
 
     def __str__(self):
@@ -52,7 +52,7 @@ def help_message(self) -> str:
         return self['help_message']
 
     @property
-    def input_options(self) -> Sequence[InputOption]:
+    def input_options(self) -> Iterable[InputOption]:
         return self['input_options']
 
 

diff --git a/sarah/main.py b/sarah/main.py
@@ -5,7 +5,7 @@
 from multiprocessing import Process
 
 import yaml
-from typing import Dict, Sequence
+from typing import Dict, Iterable
 
 from sarah.bot.hipchat import HipChat
 from sarah.bot.slack import Slack
@@ -15,7 +15,7 @@
 
 class Sarah(object):
     def __init__(self,
-                 config_paths: Sequence[Path]) -> None:
+                 config_paths: Iterable[Path]) -> None:
 
         self.config = self.load_config(config_paths)
 
@@ -33,7 +33,7 @@ def start(self) -> None:
             slack_process.start()
 
     @staticmethod
-    def load_config(paths: Sequence[Path]) -> Dict:
+    def load_config(paths: Iterable[Path]) -> Dict:
         config = {}
 
         if not paths:

diff --git a/tests/test_value_object.py b/tests/test_value_object.py
@@ -32,7 +32,7 @@ class TestOverride(object):
     class MyValueWithInit(ValueObject):
         def __init__(self,
                      pattern: Union[Pattern, AnyStr] = None,
-                     key1="spam"):
+                     key1="spam") -> None:
             if isinstance(pattern, str):
                 self['pattern'] = re.compile(pattern)