aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jesopo2019-11-18 12:06:59 +0000
committerGravatar jesopo2019-11-18 12:06:59 +0000
commit9c4902dcfe2d016b71435ff4be348ea76a1cd7cf (patch)
tree2f1c8fd44be3758558c7b56b9672d95c299df1c6
parentv1.15.0-rc1 release (diff)
signature
"EventsResultsError"->"EventResultsError", move errors to utils.error
Diffstat
-rw-r--r--modules/acronym.py2
-rw-r--r--modules/bitcoin.py2
-rw-r--r--modules/define.py4
-rw-r--r--modules/google.py4
-rw-r--r--modules/imdb.py2
-rw-r--r--modules/imgur.py2
-rw-r--r--modules/ip_addresses.py2
-rw-r--r--modules/lastfm.py2
-rw-r--r--modules/onionoo.py2
-rw-r--r--modules/soundcloud.py2
-rw-r--r--modules/spotify.py2
-rw-r--r--modules/thesaurus.py2
-rw-r--r--modules/trakt.py2
-rw-r--r--modules/urbandictionary.py2
-rw-r--r--modules/weather.py2
-rw-r--r--modules/wikipedia.py2
-rw-r--r--modules/wolframalpha.py2
-rw-r--r--modules/youtube.py4
-rw-r--r--src/utils/__init__.py14
-rw-r--r--src/utils/errors.py12
20 files changed, 35 insertions, 33 deletions
diff --git a/modules/acronym.py b/modules/acronym.py
index cba92521..212465d5 100644
--- a/modules/acronym.py
+++ b/modules/acronym.py
@@ -16,4 +16,4 @@ class Module(ModuleManager.BaseModule):
acronyms.append(element.expan.string)
event["stdout"].write("%s: %s" % (query, ", ".join(acronyms)))
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/bitcoin.py b/modules/bitcoin.py
index 4eb4c8d0..91fd84fb 100644
--- a/modules/bitcoin.py
+++ b/modules/bitcoin.py
@@ -24,4 +24,4 @@ class Module(ModuleManager.BaseModule):
event["stderr"].write("Unknown currency, available "
"currencies: %s" % ", ".join(page.data.keys()))
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/define.py b/modules/define.py
index 0c51490a..144ec227 100644
--- a/modules/define.py
+++ b/modules/define.py
@@ -46,7 +46,7 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No definitions found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
@utils.hook("received.command.randomword")
def random_word(self, event):
@@ -69,6 +69,6 @@ class Module(ModuleManager.BaseModule):
event["stdout"].write("Random Word: %s - Definition: %s" % (
page.data["word"], text))
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
else:
event["stderr"].write("Try again in a couple of seconds")
diff --git a/modules/google.py b/modules/google.py
index 123c7a58..699e8ef0 100644
--- a/modules/google.py
+++ b/modules/google.py
@@ -38,7 +38,7 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No results found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
else:
event["stderr"].write("No phrase provided")
@@ -65,6 +65,6 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No suggestions found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
else:
event["stderr"].write("No phrase provided")
diff --git a/modules/imdb.py b/modules/imdb.py
index 50c43d12..d6b0a487 100644
--- a/modules/imdb.py
+++ b/modules/imdb.py
@@ -29,4 +29,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("Title not found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/imgur.py b/modules/imgur.py
index 9c9e8c57..30208c36 100644
--- a/modules/imgur.py
+++ b/modules/imgur.py
@@ -153,4 +153,4 @@ class Module(ModuleManager.BaseModule):
if result:
event["stdout"].write(result)
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/ip_addresses.py b/modules/ip_addresses.py
index e48057fc..744900f6 100644
--- a/modules/ip_addresses.py
+++ b/modules/ip_addresses.py
@@ -102,7 +102,7 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No geoip data found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
@utils.hook("received.command.rdns")
def rdns(self, event):
diff --git a/modules/lastfm.py b/modules/lastfm.py
index c87fef61..756f1f49 100644
--- a/modules/lastfm.py
+++ b/modules/lastfm.py
@@ -96,4 +96,4 @@ class Module(ModuleManager.BaseModule):
"The user '%s' has never scrobbled before" % (
shown_username))
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/onionoo.py b/modules/onionoo.py
index 77ccb205..427cc487 100644
--- a/modules/onionoo.py
+++ b/modules/onionoo.py
@@ -14,7 +14,7 @@ def _get_relays_details(search):
URL_ONIONOO_DETAILS, get_params={"search": search}, json=True)
if page and "relays" in page.data:
return page.data["relays"]
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
def _format_relay_summary_message(relays, search):
if len(relays) > 1:
diff --git a/modules/soundcloud.py b/modules/soundcloud.py
index a91faa10..74b57efc 100644
--- a/modules/soundcloud.py
+++ b/modules/soundcloud.py
@@ -62,4 +62,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No results found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/spotify.py b/modules/spotify.py
index 242299d1..962b0a62 100644
--- a/modules/spotify.py
+++ b/modules/spotify.py
@@ -55,4 +55,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No results found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/thesaurus.py b/modules/thesaurus.py
index d2a0b3a4..df988c9e 100644
--- a/modules/thesaurus.py
+++ b/modules/thesaurus.py
@@ -46,4 +46,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("Category not found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/trakt.py b/modules/trakt.py
index b394431b..ad7a6644 100644
--- a/modules/trakt.py
+++ b/modules/trakt.py
@@ -56,4 +56,4 @@ class Module(ModuleManager.BaseModule):
event["stderr"].write(
"%s is not watching anything" % username)
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/urbandictionary.py b/modules/urbandictionary.py
index cf8e6abe..b71dc45b 100644
--- a/modules/urbandictionary.py
+++ b/modules/urbandictionary.py
@@ -37,4 +37,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No results found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/weather.py b/modules/weather.py
index a11891cc..fe2c20bf 100644
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -86,4 +86,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No weather information for this location")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/wikipedia.py b/modules/wikipedia.py
index cf7e44ca..a94109ed 100644
--- a/modules/wikipedia.py
+++ b/modules/wikipedia.py
@@ -28,5 +28,5 @@ class Module(ModuleManager.BaseModule):
else:
event["stderr"].write("No results found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/wolframalpha.py b/modules/wolframalpha.py
index 7768affa..968b05ae 100644
--- a/modules/wolframalpha.py
+++ b/modules/wolframalpha.py
@@ -30,4 +30,4 @@ class Module(ModuleManager.BaseModule):
else:
event["stdout"].write("No results")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
diff --git a/modules/youtube.py b/modules/youtube.py
index cf3f7d04..30848f4a 100644
--- a/modules/youtube.py
+++ b/modules/youtube.py
@@ -165,7 +165,7 @@ class Module(ModuleManager.BaseModule):
else:
raise utils.EventError("No videos found")
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
if url:
out = self._from_url(url)
@@ -175,7 +175,7 @@ class Module(ModuleManager.BaseModule):
out = "%s %s" % (out, short_url)
event["stdout"].write(out)
else:
- raise utils.EventsResultsError()
+ raise utils.EventResultsError()
else:
event["stderr"].write("No search phrase provided")
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index 294b9083..71e46b82 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -5,6 +5,8 @@ from . import cli, consts, datetime, decorators, irc, http, parse, security
from .decorators import export, hook, kwarg
from .settings import (BoolSetting, FunctionSetting, IntRangeSetting,
IntSetting, OptionsSetting, sensitive_format, SensitiveSetting, Setting)
+from .errors import (EventError, EventsNotEnoughArgsError, EventResultsError,
+ EventUsageError)
class Direction(enum.Enum):
Send = 0
@@ -13,18 +15,6 @@ class Direction(enum.Enum):
def prevent_highlight(nickname: str) -> str:
return nickname[0]+"\u200c"+nickname[1:]
-class EventError(Exception):
- pass
-class EventsResultsError(EventError):
- def __init__(self):
- EventError.__init__(self, "Failed to load results")
-class EventsNotEnoughArgsError(EventError):
- def __init__(self, n):
- EventError.__init__(self, "Not enough arguments (minimum %d)" % n)
-class EventsUsageError(EventError):
- def __init__(self, usage):
- EventError.__init__(self, "Not enough arguments, usage: %s" % usage)
-
class MultiCheck(object):
def __init__(self,
requests: typing.List[typing.Tuple[str, typing.List[str]]]):
diff --git a/src/utils/errors.py b/src/utils/errors.py
new file mode 100644
index 00000000..7b7720c6
--- /dev/null
+++ b/src/utils/errors.py
@@ -0,0 +1,12 @@
+class EventError(Exception):
+ pass
+class EventResultsError(EventError):
+ def __init__(self):
+ EventError.__init__(self, "Failed to load results")
+class EventNotEnoughArgsError(EventError):
+ def __init__(self, n):
+ EventError.__init__(self, "Not enough arguments (minimum %d)" % n)
+class EventUsageError(EventError):
+ def __init__(self, usage):
+ EventError.__init__(self, "Not enough arguments, usage: %s" % usage)
+
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-06-11 15:21:36 +0000