Merge branch 'master' into v2.x

Author: BobDotCom

.github/CONTRIBUTING.md

@@ -31,7 +31,7 @@ If the bug report is missing this information then it'll take us longer to fix t
 
 ## Submitting a Pull Request
 
-Submitting a pull request is fairly simple, just make sure it focuses on a single aspect and doesn't manage to have scope creep and it's probably good to go. It would be incredibly lovely if the style is consistent to that found in the project. This project follows PEP-8 guidelines (mostly) with a column limit of 125.
+Submitting a pull request is fairly simple, just make sure it focuses on a single aspect and doesn't manage to have scope creep and it's probably good to go. It would be incredibly lovely if the style is consistent to that found in the project. This project follows PEP-8 guidelines (mostly) with a column limit of 120.
 
 ## Use of "type: ignore" comments
 In some cases, it might be necessary to ignore type checker warnings for one reason or another.

.github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md

@@ -1,4 +1,4 @@
-# Developer Certificate of Origin (DCO) 
+# Developer Certificate of Origin (DCO)
 ```
 Version 1.1
 
@@ -33,4 +33,4 @@ By making a contribution to this project, I certify that:
     personal information I submit with it, including my sign-off) is
     maintained indefinitely and may be redistributed consistent with
     this project or the open source license(s) involved.
-```
+```

.github/dependabot.yml

@@ -1,6 +1,6 @@
 version: 2
 updates:
   - package-ecosystem: "pip"
-    directory: "/" 
+    directory: "/"
     schedule:
       interval: "daily"

.gitignore

@@ -30,4 +30,4 @@ build/
 test.py
 build/
 node_modules/*
-test.py
+test.py

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile = black

.pylintrc

@@ -9,4 +9,4 @@ enable=bad-indentation,line-too-long
 
 indent-string='    '
 
-max-line-length=120
+max-line-length=120

README.rst

@@ -95,16 +95,16 @@ Quick Example
     import discord
 
     bot = discord.Bot()
-    
+
     @bot.slash_command()
     async def hello(ctx, name: str = None):
         name = name or ctx.author.name
         await ctx.respond(f"Hello {name}!")
-        
+
     @bot.user_command(name="Say Hello")
     async def hi(ctx, user):
         await ctx.respond(f"{ctx.author.mention} says hello to {user.name}!")
-        
+
     bot.run("token")
 
 Traditional Commands Example

discord/__init__.py

@@ -9,18 +9,18 @@
 
 """
 
-__title__ = 'discord'
-__author__ = 'Pycord Development'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development'
-__version__ = '2.0.0b4'
+__title__ = "pycord"
+__author__ = "Pycord Development"
+__license__ = "MIT"
+__copyright__ = "Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development"
+__version__ = "2.0.0b5"
 
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
 import logging
-from typing import NamedTuple, Literal
+from typing import Literal, NamedTuple
 
-from . import utils, opus, abc, ui, sinks
+from . import abc, opus, sinks, ui, utils
 from .activity import *
 from .appinfo import *
 from .asset import *
@@ -39,6 +39,7 @@
 from .file import *
 from .flags import *
 from .guild import *
+from .http import *
 from .integrations import *
 from .interactions import *
 from .invite import *
@@ -52,7 +53,7 @@
 from .raw_models import *
 from .reaction import *
 from .role import *
-from .scheduled_events import ScheduledEvent, ScheduledEventLocation
+from .scheduled_events import *
 from .shard import *
 from .stage_instance import *
 from .sticker import *
@@ -74,6 +75,6 @@ class VersionInfo(NamedTuple):
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel='beta', serial=4)
+version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel="beta", serial=5)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())