Merge master and fix conflicts

* Use absolute imports in the code block modules for consistency
* Move has_lines utility function into the helpers module
* Prefix names of code block modules with underscores so they won't
  get picked up as extensions by the extension manager

1 files changed, 3 insertions, 2 deletions

diff --git a/Pipfile b/Pipfile
index 6fff2223e..99fc70b46 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,13 +7,14 @@ name = "pypi"
 aio-pika = "~=6.1"
 aiodns = "~=2.0"
 aiohttp = "~=3.5"
+aioping = "~=0.3.1"
 aioredis = "~=1.3.1"
+"async-rediscache[fakeredis]" = "~=0.1.2"
 beautifulsoup4 = "~=4.9"
 colorama = {version = "~=0.4.3",sys_platform = "== 'win32'"}
 coloredlogs = "~=14.0"
 deepdiff = "~=4.0"
-discord.py = "~=1.4.0"
-fakeredis = "~=1.4"
+"discord.py" = "~=1.5.0"
 feedparser = "~=5.2"
 fuzzywuzzy = "~=0.17"
 lxml = "~=4.4"