Rename modules to prevent pollution of namespace.

sigmavirus24 · sigmavirus24 · commit 6c98efeafde5 · 2012-08-02T23:14:25.000-04:00
Part of the problem with testing this has been that in the API there are
functions like user() or gist() which prevent me from being able to import
from github3.gist or github3.user the class(es) I need to make sure the right
objects are being returned. Changing the module names allows for no ambiguity
and (ideally) no clashes in names. This also means I can clean up __init__.py
which was becoming awfully cluttered.
diff --git a/github3/events.py b/github3/events.py
diff --git a/github3/gist.py b/github3/gist.py
@@ -8,7 +8,7 @@
 
 from json import dumps
 from .models import GitHubObject, GitHubCore, BaseComment
-from .user import User
+from .users import User
 
 
 class GistFile(GitHubObject):
diff --git a/github3/git.py b/github3/git.py
@@ -9,7 +9,7 @@
 from base64 import b64decode
 from json import dumps
 from .models import GitHubObject, GitHubCore, BaseCommit
-from .user import User
+from .users import User
 
 
 class Blob(GitHubObject):
diff --git a/github3/github.py b/github3/github.py
@@ -8,14 +8,14 @@
 
 from requests import session
 from json import dumps
-from .event import Event
-from .gist import Gist
-from .issue import Issue, issue_params
+from .events import Event
+from .gists import Gist
+from .issues import Issue, issue_params
 from .legacy import LegacyIssue, LegacyRepo, LegacyUser
 from .models import GitHubCore
-from .org import Organization
-from .repo import Repository
-from .user import User, Key
+from .orgs import Organization
+from .repos import Repository
+from .users import User, Key
 
 
 class GitHub(GitHubCore):
diff --git a/github3/issues.py b/github3/issues.py
@@ -9,7 +9,7 @@
 from json import dumps
 from re import match
 from .models import GitHubCore, BaseComment
-from .user import User
+from .users import User
 
 
 class Label(GitHubCore):
diff --git a/github3/org.py b/github3/org.py
@@ -7,10 +7,10 @@
 """
 
 from json import dumps
-from .event import Event
+from .events import Event
 from .models import BaseAccount, GitHubCore
-from .repo import Repository
-from .user import User
+from .repos import Repository
+from .users import User
 
 
 class Team(GitHubCore):
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -9,7 +9,7 @@
 from json import dumps
 from .git import Commit
 from .models import GitHubObject, GitHubCore, BaseComment
-from .user import User
+from .users import User
 
 
 class PullDestination(GitHubCore):
diff --git a/github3/repos.py b/github3/repos.py
@@ -8,12 +8,12 @@
 
 from base64 import b64decode
 from json import dumps
-from .event import Event
-from .issue import Issue, Label, Milestone, issue_params
+from .events import Event
+from .issues import Issue, Label, Milestone, issue_params
 from .git import Blob, Commit, Reference, Tag, Tree
 from .models import GitHubObject, GitHubCore, BaseComment, BaseCommit
 from .pulls import PullRequest
-from .user import User, Key
+from .users import User, Key
 
 
 class Repository(GitHubCore):
diff --git a/github3/users.py b/github3/users.py
@@ -7,7 +7,7 @@
 """
 
 from json import dumps
-from .event import Event
+from .events import Event
 from .models import GitHubObject, GitHubCore, BaseAccount
 
 
