🔀 Merge pull request #311

Pre Release 2.0.0a13.post1
nonebot · Apr 1, 2021 · 916d620 · 916d620
2 parents b09a751 + 0fd82d4
commit 916d620
Show file tree

Hide file tree

Showing 51 changed files with 9 additions and 6 deletions.
diff --git a/archive/2.0.0a13/README.md → archive/2.0.0a13.post1/README.md b/archive/2.0.0a13/README.md → archive/2.0.0a13.post1/README.md
diff --git a/archive/2.0.0a13/advanced/README.md → archive/2.0.0a13.post1/advanced/README.md b/archive/2.0.0a13/advanced/README.md → archive/2.0.0a13.post1/advanced/README.md
diff --git a/...e/2.0.0a13/advanced/export-and-require.md → ...0a13.post1/advanced/export-and-require.md b/...e/2.0.0a13/advanced/export-and-require.md → ...0a13.post1/advanced/export-and-require.md
diff --git a/.../2.0.0a13/advanced/overloaded-handlers.md → ...a13.post1/advanced/overloaded-handlers.md b/.../2.0.0a13/advanced/overloaded-handlers.md → ...a13.post1/advanced/overloaded-handlers.md
diff --git a/archive/2.0.0a13/advanced/permission.md → ...ive/2.0.0a13.post1/advanced/permission.md b/archive/2.0.0a13/advanced/permission.md → ...ive/2.0.0a13.post1/advanced/permission.md
diff --git a/archive/2.0.0a13/advanced/publish-plugin.md → ...2.0.0a13.post1/advanced/publish-plugin.md b/archive/2.0.0a13/advanced/publish-plugin.md → ...2.0.0a13.post1/advanced/publish-plugin.md
diff --git a/archive/2.0.0a13/advanced/runtime-hook.md → ...e/2.0.0a13.post1/advanced/runtime-hook.md b/archive/2.0.0a13/advanced/runtime-hook.md → ...e/2.0.0a13.post1/advanced/runtime-hook.md
diff --git a/archive/2.0.0a13/advanced/scheduler.md → archive/2.0.0a13.post1/advanced/scheduler.md b/archive/2.0.0a13/advanced/scheduler.md → archive/2.0.0a13.post1/advanced/scheduler.md
diff --git a/archive/2.0.0a13/api/README.md → archive/2.0.0a13.post1/api/README.md b/archive/2.0.0a13/api/README.md → archive/2.0.0a13.post1/api/README.md
diff --git a/archive/2.0.0a13/api/adapters/README.md → ...ive/2.0.0a13.post1/api/adapters/README.md b/archive/2.0.0a13/api/adapters/README.md → ...ive/2.0.0a13.post1/api/adapters/README.md
diff --git a/archive/2.0.0a13/api/adapters/cqhttp.md → ...ive/2.0.0a13.post1/api/adapters/cqhttp.md b/archive/2.0.0a13/api/adapters/cqhttp.md → ...ive/2.0.0a13.post1/api/adapters/cqhttp.md
diff --git a/archive/2.0.0a13/api/adapters/ding.md → archive/2.0.0a13.post1/api/adapters/ding.md b/archive/2.0.0a13/api/adapters/ding.md → archive/2.0.0a13.post1/api/adapters/ding.md
diff --git a/archive/2.0.0a13/api/adapters/mirai.md → archive/2.0.0a13.post1/api/adapters/mirai.md b/archive/2.0.0a13/api/adapters/mirai.md → archive/2.0.0a13.post1/api/adapters/mirai.md
diff --git a/archive/2.0.0a13/api/config.md → archive/2.0.0a13.post1/api/config.md b/archive/2.0.0a13/api/config.md → archive/2.0.0a13.post1/api/config.md
diff --git a/archive/2.0.0a13/api/drivers/README.md → archive/2.0.0a13.post1/api/drivers/README.md b/archive/2.0.0a13/api/drivers/README.md → archive/2.0.0a13.post1/api/drivers/README.md
diff --git a/archive/2.0.0a13/api/drivers/fastapi.md → ...ive/2.0.0a13.post1/api/drivers/fastapi.md b/archive/2.0.0a13/api/drivers/fastapi.md → ...ive/2.0.0a13.post1/api/drivers/fastapi.md
diff --git a/archive/2.0.0a13/api/drivers/quart.md → archive/2.0.0a13.post1/api/drivers/quart.md b/archive/2.0.0a13/api/drivers/quart.md → archive/2.0.0a13.post1/api/drivers/quart.md
diff --git a/archive/2.0.0a13/api/exception.md → archive/2.0.0a13.post1/api/exception.md b/archive/2.0.0a13/api/exception.md → archive/2.0.0a13.post1/api/exception.md
diff --git a/archive/2.0.0a13/api/handler.md → archive/2.0.0a13.post1/api/handler.md b/archive/2.0.0a13/api/handler.md → archive/2.0.0a13.post1/api/handler.md
diff --git a/archive/2.0.0a13/api/log.md → archive/2.0.0a13.post1/api/log.md b/archive/2.0.0a13/api/log.md → archive/2.0.0a13.post1/api/log.md
diff --git a/archive/2.0.0a13/api/matcher.md → archive/2.0.0a13.post1/api/matcher.md b/archive/2.0.0a13/api/matcher.md → archive/2.0.0a13.post1/api/matcher.md
diff --git a/archive/2.0.0a13/api/message.md → archive/2.0.0a13.post1/api/message.md b/archive/2.0.0a13/api/message.md → archive/2.0.0a13.post1/api/message.md
diff --git a/archive/2.0.0a13/api/nonebot.md → archive/2.0.0a13.post1/api/nonebot.md b/archive/2.0.0a13/api/nonebot.md → archive/2.0.0a13.post1/api/nonebot.md
diff --git a/archive/2.0.0a13/api/permission.md → archive/2.0.0a13.post1/api/permission.md b/archive/2.0.0a13/api/permission.md → archive/2.0.0a13.post1/api/permission.md
diff --git a/archive/2.0.0a13/api/plugin.md → archive/2.0.0a13.post1/api/plugin.md b/archive/2.0.0a13/api/plugin.md → archive/2.0.0a13.post1/api/plugin.md
diff --git a/archive/2.0.0a13/api/rule.md → archive/2.0.0a13.post1/api/rule.md b/archive/2.0.0a13/api/rule.md → archive/2.0.0a13.post1/api/rule.md
diff --git a/archive/2.0.0a13/api/typing.md → archive/2.0.0a13.post1/api/typing.md b/archive/2.0.0a13/api/typing.md → archive/2.0.0a13.post1/api/typing.md
diff --git a/archive/2.0.0a13/api/utils.md → archive/2.0.0a13.post1/api/utils.md b/archive/2.0.0a13/api/utils.md → archive/2.0.0a13.post1/api/utils.md
diff --git a/archive/2.0.0a13/guide/README.md → archive/2.0.0a13.post1/guide/README.md b/archive/2.0.0a13/guide/README.md → archive/2.0.0a13.post1/guide/README.md
diff --git a/...ive/2.0.0a13/guide/basic-configuration.md → ...0.0a13.post1/guide/basic-configuration.md b/...ive/2.0.0a13/guide/basic-configuration.md → ...0.0a13.post1/guide/basic-configuration.md
diff --git a/archive/2.0.0a13/guide/cqhttp-guide.md → archive/2.0.0a13.post1/guide/cqhttp-guide.md b/archive/2.0.0a13/guide/cqhttp-guide.md → archive/2.0.0a13.post1/guide/cqhttp-guide.md
diff --git a/archive/2.0.0a13/guide/creating-a-handler.md → ....0.0a13.post1/guide/creating-a-handler.md b/archive/2.0.0a13/guide/creating-a-handler.md → ....0.0a13.post1/guide/creating-a-handler.md
diff --git a/archive/2.0.0a13/guide/creating-a-matcher.md → ....0.0a13.post1/guide/creating-a-matcher.md b/archive/2.0.0a13/guide/creating-a-matcher.md → ....0.0a13.post1/guide/creating-a-matcher.md
diff --git a/archive/2.0.0a13/guide/creating-a-plugin.md → ...2.0.0a13.post1/guide/creating-a-plugin.md b/archive/2.0.0a13/guide/creating-a-plugin.md → ...2.0.0a13.post1/guide/creating-a-plugin.md
diff --git a/archive/2.0.0a13/guide/creating-a-project.md → ....0.0a13.post1/guide/creating-a-project.md b/archive/2.0.0a13/guide/creating-a-project.md → ....0.0a13.post1/guide/creating-a-project.md
diff --git a/archive/2.0.0a13/guide/ding-guide.md → archive/2.0.0a13.post1/guide/ding-guide.md b/archive/2.0.0a13/guide/ding-guide.md → archive/2.0.0a13.post1/guide/ding-guide.md
diff --git a/archive/2.0.0a13/guide/end-or-start.md → archive/2.0.0a13.post1/guide/end-or-start.md b/archive/2.0.0a13/guide/end-or-start.md → archive/2.0.0a13.post1/guide/end-or-start.md
diff --git a/archive/2.0.0a13/guide/getting-started.md → ...e/2.0.0a13.post1/guide/getting-started.md b/archive/2.0.0a13/guide/getting-started.md → ...e/2.0.0a13.post1/guide/getting-started.md
diff --git a/...ve/2.0.0a13/guide/images/Handle-Event.png → ....0a13.post1/guide/images/Handle-Event.png b/...ve/2.0.0a13/guide/images/Handle-Event.png → ....0a13.post1/guide/images/Handle-Event.png
diff --git a/...ve/2.0.0a13/guide/images/ding/jiaqian.png → ....0a13.post1/guide/images/ding/jiaqian.png b/...ve/2.0.0a13/guide/images/ding/jiaqian.png → ....0a13.post1/guide/images/ding/jiaqian.png
diff --git a/...0.0a13/guide/images/ding/test_webhook.png → ....post1/guide/images/ding/test_webhook.png b/...0.0a13/guide/images/ding/test_webhook.png → ....post1/guide/images/ding/test_webhook.png
diff --git a/...ve/2.0.0a13/guide/images/ding/webhook.png → ....0a13.post1/guide/images/ding/webhook.png b/...ve/2.0.0a13/guide/images/ding/webhook.png → ....0a13.post1/guide/images/ding/webhook.png
diff --git a/archive/2.0.0a13/guide/installation.md → archive/2.0.0a13.post1/guide/installation.md b/archive/2.0.0a13/guide/installation.md → archive/2.0.0a13.post1/guide/installation.md
diff --git a/archive/2.0.0a13/guide/loading-a-plugin.md → .../2.0.0a13.post1/guide/loading-a-plugin.md b/archive/2.0.0a13/guide/loading-a-plugin.md → .../2.0.0a13.post1/guide/loading-a-plugin.md
diff --git a/archive/2.0.0a13/guide/mirai-guide.md → archive/2.0.0a13.post1/guide/mirai-guide.md b/archive/2.0.0a13/guide/mirai-guide.md → archive/2.0.0a13.post1/guide/mirai-guide.md
diff --git a/archive/2.0.0a13/sidebar.config.json → archive/2.0.0a13.post1/sidebar.config.json b/archive/2.0.0a13/sidebar.config.json → archive/2.0.0a13.post1/sidebar.config.json
diff --git a/docs/.vuepress/versions.json b/docs/.vuepress/versions.json
@@ -1,5 +1,5 @@
 [
-  "2.0.0a13",
+  "2.0.0a13.post1",
   "2.0.0a10",
   "2.0.0a8.post2",
   "2.0.0a7"

diff --git a/nonebot/adapters/_base.py b/nonebot/adapters/_base.py
@@ -9,9 +9,10 @@
 import asyncio
 from copy import copy
 from functools import reduce, partial
+from typing_extensions import Protocol
 from dataclasses import dataclass, field
 from typing import (Any, Set, Dict, Union, TypeVar, Mapping, Optional, Iterable,
-                    Protocol, Awaitable, TYPE_CHECKING)
+                    Awaitable, TYPE_CHECKING)
 
 from pydantic import BaseModel
 

diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py
@@ -65,8 +65,9 @@ def matcher(self) -> Set[Type[Matcher]]:
 
 
 def _store_matcher(matcher: Type[Matcher]):
-    plugin_name = matcher.module.split(".", maxsplit=1)[0]
-    _plugin_matchers[plugin_name].add(matcher)
+    if matcher.module:
+        plugin_name = matcher.module.split(".", maxsplit=1)[0]
+        _plugin_matchers[plugin_name].add(matcher)
 
 
 def on(type: str = "",

diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py
@@ -179,7 +179,8 @@ def find_spec(self, fullname: str, path, target):
                 newname = manager._rewrite_module_name(fullname)
                 if newname:
                     spec = PathFinder.find_spec(
-                        newname, [*manager.search_path, *(path or [])], target)
+                        newname, [*manager.search_path, *(path or sys.path)],
+                        target)
                     if spec:
                         spec.loader = PluginLoader(manager, newname,
                                                    spec.origin)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot2"
-version = "2.0.0-alpha.13"
+version = "2.0.0a13.post1"
 description = "An asynchronous python bot framework."
 authors = ["yanyongyu <[email protected]>"]
 license = "MIT"