Team 11 by delterr · Pull Request #11 · python-discord/code-jam-1

delterr · 2018-03-23T06:18:44Z

No description provided.

gdude2002 · 2018-03-23T09:47:55Z

Pipfile

 aiohttp = "<2.3.0,>=2.0.0"
 websockets = ">=4.0,<5.0"
+"beautifulsoup4" = "*"
+requests-html = "*"


It looks like you've edited this file by hand. This is bad practise, but at least you've updated the lockfile as well.

Please be careful about using requests - it's not asynchronous.

I am 100% sure that I did not update the Pipfile by hand. I used pipenv install requests-html

Okay. Either way, we've made a statement about the wikipedia module on Discord, and the same applies to Requests. Requests does not support asyncio, and you're going to want to avoid any solution that doesn't.

[UPDATE] Ignored a silly rule from flake8.

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. Adding random snakes

Added Python bot message

Adding W503 and E226 to flake8 ignore list.

PEP 8 fix

gdude2002 · 2018-03-25T10:30:43Z

.gitignore

 .Python
 env/
+.idea/
+.env


Aren't these both already in the gitignore?

gdude2002 · 2018-03-25T10:31:05Z

Pipfile

 aiohttp = "<2.3.0,>=2.0.0"
 websockets = ">=4.0,<5.0"
+"beautifulsoup4" = "*"
+wikipedia = "*"


If you're not using this, you should pipenv uninstall it.

gdude2002 · 2018-03-25T10:31:24Z

bot/cogs/snakes.py

@@ -1,8 +1,10 @@
 # coding=utf-8
-import logging
+import logging, aiohttp, random, wikipedia


No, you should be using separate lines, and they should be in alphabetical order.

gdude2002 · 2018-03-25T10:31:57Z

bot/cogs/snakes.py

    Snake-related commands
    """
+    python_info = '''
+                    Python (Programming Language)


You should probably remove all these huge indents.

You also don't need the \ns in here. Those are taken from how you've formatted the string.

gdude2002 · 2018-03-25T10:36:57Z

bot/cogs/snakes.py

        :param name: Optional, the name of the snake to get information for - omit for a random snake
        :return: A dict containing information on a snake
        """
+        name = str(name)


No, don't do this. If there's no snake name passed, this will now be "None", which is annoying to check for.

gdude2002 · 2018-03-25T10:37:22Z

bot/cogs/snakes.py

+        if name.lower() == 'python':
+            name = self.python_info
+
+        return name


This method doesn't work at all. Return name? Are you still working on this?

gdude2002 · 2018-03-25T10:37:47Z

bot/cogs/snakes.py

        :param name: Optional, the name of the snake to get information for - omit for a random snake
        """
+        # await ctx.send(BeautifulSoup(text, 'lxml').find("title"))
+        name = str(name)


Again, why are you doing this?

gdude2002 · 2018-03-25T10:38:11Z

bot/cogs/snakes.py

+                title = soup.find('h1').text
+                description = soup.find('table').text
+
+                em = discord.Embed(title=title, description=description)


While you should be creating the embed in this method, you should be retrieving the information over in get_snek().

gdude2002 · 2018-03-25T10:41:12Z

bot/cogs/snakes.py

+
+        # Any additional commands can be placed here. Be creative, but keep it to a reasonable amount!
+    @command()
+    async def snake(self, ctx: Context, x=50, y=30):


Really fun idea. But maybe a little ambitious for you guys.

This is super hard to read, I'm going to have to test it to really see what it does. Maybe you could comment it?

Also, perhaps you could use reactions via wait_for_reactions() instead of a list of inputs?

converted all dict types apart from head to tuples added snake tail

Delete unnecessary code

Adding snake description

improved message deletion, mentions, Python is now Open-Source

gdude2002 · 2018-03-25T21:52:17Z

You code is failing to lint. Please see Travis for more information.

delterr added 2 commits March 23, 2018 06:15

first commit

4c99800

Added temp code for bot.get

7ed1c2a

gdude2002 reviewed Mar 23, 2018

View reviewed changes

delterr and others added 27 commits March 23, 2018 15:48

Updated pipfile/pipfile.lock

020deb7

adding temporary code that fetches wiki page on snakes

968c748

added the fetch code to getsnek

3011280

added .idea/ to .gitignore

1f6f877

added get_snek() call to get()

fb31d2b

replaced message.channel with ctx

c8d42d3

Removed snake find

b8fdfd7

Fetching data

810ebad

Merge remote-tracking branch 'origin/master'

95443bb

Merge pull request #1 from discord-python/master

367a400

[UPDATE] Ignored a silly rule from flake8.

Added random snake

502abb9

Merge remote-tracking branch 'origin/master'

ac46387

wiki site now a member variable

57d1394

fixed post-merge issues

2bcae58

combined imports

3c7367b

added 'wikipedia' to imports

b1376c8

replace URL with string for wiki

6734b50

Merge branch 'master' of https://github.com/Hasan-Ahmad/code-jam-1

090f14f

Added Python bot message

Merge remote-tracking branch 'origin/master'

b5c5402

Added python message

fcaecfb

Merge pull request #2 from discord-python/master

71bde19

Adding W503 and E226 to flake8 ignore list.

Merge branch 'master' of https://github.com/Hasan-Ahmad/code-jam-1

018e523

PEP 8 fix

Merge remote-tracking branch 'origin/master'

59fa010

test

8e5cf70

PEP 8 fix

e36ae9e

Updated snake name fetch

9f075e9

delterr and others added 4 commits March 25, 2018 06:08

update nakes.py

aa5b3ed

snake no tail complete

9bbeb30

DNP: bug with logging

f448a4e

apples and framework for tail

36933e4

gdude2002 suggested changes Mar 25, 2018

View reviewed changes

xedre and others added 12 commits March 25, 2018 12:03

added lxml to pipfile

417d7a7

tuples/tail

6a804bd

converted all dict types apart from head to tuples added snake tail

Merge branch 'master' of https://github.com/Hasan-Ahmad/code-jam-1

ac7c08a

Delete unnecessary code

Merge branch 'master' of https://github.com/Hasan-Ahmad/code-jam-1

996edba

Adding snake description

removed unused imports

40efcaa

Changed how much info is scraped from the table

56da195

PEP8 fix

0c1c026

you can die now:

989e5d1

improved message deletion, mentions, Python is now Open-Source

Snake complete

adff2e6

PEP8 fix, typo fix, removed unnecessary comments

4399dcb

emogis

8904bce

petty rage push

e0bf1cc

ghost approved these changes Mar 25, 2018

View reviewed changes

xedre added 8 commits March 25, 2018 22:16

done stuff to changes

f03b98f

main loop breaks now all use Running

127051f

added break to user inputs

41b2ba4

removed black line

a620972

added blank line

f811720

re-ordered some imports

5987a8a

re-ordered some imports

804af0a

re-ordered some imports

f87d75e

ghost approved these changes Mar 25, 2018

View reviewed changes

re-ordered some imports

42eae45

Update import order

0c83aaf

Uh oh!

Conversation

delterr commented Mar 23, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gdude2002 commented Mar 25, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants