diff --git a/LICENSE b/LICENSE index e69de29bb..e91fdae81 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Rapptz + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 4ec3cdb50..60281b607 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# PyDiscord +# discord.py -PyDiscord is an API wrapper for Discord written in Python. +discord.py is an API wrapper for Discord written in Python. This was written to allow easier writing of bots or chat logs. diff --git a/discord/client.py b/discord/client.py index f84209f5f..dc58c2db8 100644 --- a/discord/client.py +++ b/discord/client.py @@ -346,8 +346,8 @@ class Client(object): 'token': self.token, 'properties': { '$os': sys_platform, - '$browser': 'pydiscord', - '$device': 'pydiscord', + '$browser': 'discord.py', + '$device': 'discord.py', '$referrer': '', '$referring_domain': '' } diff --git a/docs/Makefile b/docs/Makefile index 42691163a..05ff4d939 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -86,17 +86,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pydiscord.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/discord.py.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pydiscord.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/discord.py.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/pydiscord" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pydiscord" + @echo "# mkdir -p $$HOME/.local/share/devhelp/discord.py" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/discord.py" @echo "# devhelp" epub: diff --git a/docs/api.rst b/docs/api.rst index dcfc8bbf6..937eff70c 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -3,7 +3,7 @@ API Reference =============== -The following section outlines the API of pydiscord. +The following section outlines the API of discord.py. Client diff --git a/docs/conf.py b/docs/conf.py index f47a0f62f..2c784de48 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# pydiscord documentation build configuration file, created by +# discord.py documentation build configuration file, created by # sphinx-quickstart on Fri Aug 21 05:43:30 2015. # # This file is execfile()d with the current directory set to its @@ -45,7 +45,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'pydiscord' +project = u'discord.py' copyright = u'2015, Rapptz' # The version info for the project you're documenting, acts as replacement for @@ -197,7 +197,7 @@ html_static_path = ['_static'] #html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. -htmlhelp_basename = 'pydiscorddoc' +htmlhelp_basename = 'discord.pydoc' # -- Options for LaTeX output --------------------------------------------- @@ -219,7 +219,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'pydiscord.tex', u'pydiscord Documentation', + ('index', 'discord.py.tex', u'discord.py Documentation', u'Rapptz', 'manual'), ] @@ -249,7 +249,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'pydiscord', u'pydiscord Documentation', + ('index', 'discord.py', u'discord.py Documentation', [u'Rapptz'], 1) ] @@ -263,8 +263,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'pydiscord', u'pydiscord Documentation', - u'Rapptz', 'pydiscord', 'One line description of project.', + ('index', 'discord.py', u'discord.py Documentation', + u'Rapptz', 'discord.py', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/index.rst b/docs/index.rst index e74189d80..2e0d878da 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,10 +1,10 @@ -.. pydiscord documentation master file, created by +.. discord.py documentation master file, created by sphinx-quickstart on Fri Aug 21 05:43:30 2015. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to pydiscord's documentation! -===================================== +Welcome to discord.py's documentation! +====================================== Contents: diff --git a/docs/make.bat b/docs/make.bat index f04b4b55c..bb9b63539 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -127,9 +127,9 @@ if "%1" == "qthelp" ( echo. echo.Build finished; now you can run "qcollectiongenerator" with the ^ .qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pydiscord.qhcp + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\discord.py.qhcp echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pydiscord.ghc + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\discord.py.ghc goto end ) diff --git a/setup.py b/setup.py index f40748f91..4b059e54d 100644 --- a/setup.py +++ b/setup.py @@ -16,9 +16,9 @@ readme = '' with open('README.md') as f: readme = f.read() -setup(name='pydiscord', +setup(name='discord.py', author='Rapptz', - url='https://github.com/Rapptz/pydiscord', + url='https://github.com/Rapptz/discord.py', version=version, packages=['discord'], license='MIT',