🔀 Merge pull request #311

Pre Release 2.0.0a13.post1

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"

nonebot/adapters/_base.py

@@ -9,9 +9,10 @@ import abc
 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
 

nonebot/plugin/__init__.py

@@ -65,6 +65,7 @@ class Plugin(object):
 
 
 def _store_matcher(matcher: Type[Matcher]):
+    if matcher.module:
         plugin_name = matcher.module.split(".", maxsplit=1)[0]
         _plugin_matchers[plugin_name].add(matcher)
 

nonebot/plugin/manager.py

@@ -179,7 +179,8 @@ class PluginFinder(MetaPathFinder):
                 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)

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 <yyy@nonebot.dev>"]
 license = "MIT"