Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/github/codeql-ac…
Browse files Browse the repository at this point in the history
…tion-3
  • Loading branch information
plun1331 authored Dec 14, 2023
2 parents cf005ed + ca9700f commit efd047c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion discord/ext/commands/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ async def dispatch_error(self, ctx: Context, error: Exception) -> None:
async def transform(self, ctx: Context, param: inspect.Parameter) -> Any:
if isinstance(param.annotation, Option):
default = param.annotation.default
required = param.annotation.required or default is None
required = param.annotation.required
else:
default = param.default
required = default is param.empty
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-r _.txt
pylint~=3.0.2
pylint~=3.0.3
pytest~=7.4.3
pytest-asyncio~=0.23.2
# pytest-order~=1.0.1
mypy~=1.7.1
coverage~=7.3
pre-commit==3.5.0
codespell==2.2.6
bandit==1.7.5
bandit==1.7.6
flake8==6.1.0

0 comments on commit efd047c

Please sign in to comment.