Merge pull request sigmavirus24#221 from bgilbert/attributes

sigmavirus24 · sigmavirus24 · commit 92bf52bbe723 · 2014-04-11T11:33:12.000-05:00
Attribute improvements
diff --git a/github3/auths.py b/github3/auths.py
@@ -48,13 +48,9 @@ def __init__(self, auth, session=None):
         self.id = auth.get('id', 0)
         self._api = self._build_url('authorizations', str(self.id))
         #: datetime object representing when the authorization was created.
-        self.created_at = None
-        if auth.get('created_at'):
-            self.created_at = self._strptime(auth.get('created_at'))
-        #: datetime object representing when the authorization was created.
-        self.updated_at = None
-        if auth.get('updated_at'):
-            self.updated_at = self._strptime(auth.get('updated_at'))
+        self.created_at = self._strptime(auth.get('created_at'))
+        #: datetime object representing when the authorization was updated.
+        self.updated_at = self._strptime(auth.get('updated_at'))
 
     def _repr(self):
         return '<Authorization [{0}]>'.format(self.name)
diff --git a/github3/gists/gist.py b/github3/gists/gist.py
@@ -76,7 +76,7 @@ def __init__(self, data, session=None):
 
         owner = data.get('owner')
         #: :class:`User <github3.users.User>` object representing the owner of
-        #  the gist.
+        #: the gist.
         self.owner = User(owner, self) if owner else None
 
         self._files = [GistFile(data['files'][f]) for f in data['files']]
diff --git a/github3/git.py b/github3/git.py
@@ -76,7 +76,7 @@ def __init__(self, commit, session=None):
         super(Commit, self).__init__(commit, session)
 
         #: dict containing at least the name, email and date the commit was
-        #  created
+        #: created
         self.author = commit.get('author', {}) or {}
         # If GH returns nil/None then make sure author is a dict
         self._author_name = self.author.get('name', '')
diff --git a/github3/issues/event.py b/github3/issues/event.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from github3.models import GitHubCore
+from github3.users import User
 
 
 class IssueEvent(GitHubCore):
@@ -38,6 +39,11 @@ def __init__(self, event, issue=None):
             from github3.issues import Issue
             self.issue = Issue(event.get('issue'), self)
 
+        #: :class:`User <github3.users.User>` that generated the event.
+        self.actor = event.get('actor')
+        if self.actor:
+            self.actor = User(self.actor, self._session)
+
         #: Number of comments
         self.comments = event.get('comments', 0)
 
diff --git a/github3/issues/issue.py b/github3/issues/issue.py
@@ -35,7 +35,7 @@ def __init__(self, issue, session=None):
         super(Issue, self).__init__(issue, session)
         self._api = issue.get('url', '')
         #: :class:`User <github3.users.User>` representing the user the issue
-        #  was assigned to.
+        #: was assigned to.
         self.assignee = issue.get('assignee')
         if self.assignee:
             self.assignee = User(issue.get('assignee'), self._session)
@@ -48,9 +48,7 @@ def __init__(self, issue, session=None):
 
         # If an issue is still open, this field will be None
         #: datetime object representing when the issue was closed.
-        self.closed_at = None
-        if issue.get('closed_at'):
-            self.closed_at = self._strptime(issue.get('closed_at'))
+        self.closed_at = self._strptime(issue.get('closed_at'))
 
         #: Number of comments on this issue.
         self.comments = issue.get('comments')
diff --git a/github3/issues/milestone.py b/github3/issues/milestone.py
@@ -26,19 +26,19 @@ def __init__(self, mile, session=None):
         #: Description of this milestone.
         self.description = mile.get('description')
         #: :class:`User <github3.users.User>` object representing the creator
-        #  of the milestone.
+        #: of the milestone.
         self.creator = User(mile.get('creator'), self._session)
         #: Number of issues associated with this milestone which are still
-        #  open.
+        #: open.
         self.open_issues = mile.get('open_issues')
         #: The number of closed issues associated with this milestone.
         self.closed_issues = mile.get('closed_issues')
         #: datetime object representing when the milestone was created.
         self.created_at = self._strptime(mile.get('created_at'))
         #: datetime representing when this milestone is due.
-        self.due_on = None
-        if mile.get('due_on'):
-            self.due_on = self._strptime(mile.get('due_on'))
+        self.due_on = self._strptime(mile.get('due_on'))
+        #: datetime object representing when the milestone was updated.
+        self.updated_at = self._strptime(mile.get('updated_at'))
 
     def _repr(self):
         return '<Milestone [{0}]>'.format(self)
diff --git a/github3/models.py b/github3/models.py
@@ -229,7 +229,7 @@ def __init__(self, comment, session):
         #: Body of the comment. (As written by the commenter)
         self.body = comment.get('body')
         #: Body of the comment formatted as plain-text. (Stripped of markdown,
-        #  etc.)
+        #: etc.)
         self.body_text = comment.get('body_text')
         #: Body of the comment formatted as html.
         self.body_html = comment.get('body_html')
@@ -319,9 +319,7 @@ def __init__(self, acct, session):
         self.company = acct.get('company', '')
 
         #: datetime object representing the date the account was created
-        self.created_at = None
-        if acct.get('created_at'):
-            self.created_at = self._strptime(acct.get('created_at'))
+        self.created_at = self._strptime(acct.get('created_at'))
 
         #: E-mail address of the user/org
         self.email = acct.get('email')
diff --git a/github3/notifications.py b/github3/notifications.py
@@ -49,9 +49,7 @@ def __init__(self, notif, session=None):
         #: Dictionary of urls for the thread
         self.urls = notif.get('urls')
         #: datetime object representing the last time the user read the thread
-        self.last_read_at = notif.get('last_read_at')
-        if self.last_read_at:
-            self.last_read_at = self._strptime(self.last_read_at)
+        self.last_read_at = self._strptime(notif.get('last_read_at'))
         #: The reason you're receiving the notification
         self.reason = notif.get('reason')
         #: Subject of the Notification, e.g., which issue/pull/diff is this in
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -112,10 +112,8 @@ def __init__(self, pull, session=None):
         #: Number of deletions on this pull request
         self.deletions = pull.get('deletions')
 
-        closed = pull.get('closed_at')
-        # If the pull request has been closed
         #: datetime object representing when the pull was closed
-        self.closed_at = self._strptime(closed) if closed else None
+        self.closed_at = self._strptime(pull.get('closed_at'))
         #: Number of comments
         self.comments = pull.get('comments')
         #: Comments url (not a template)
@@ -162,9 +160,7 @@ def __init__(self, pull, session=None):
         }
 
         #: datetime object representing when the pull was merged
-        merged = pull.get('merged_at')
-        # If the pull request has been merged
-        self.merged_at = self._strptime(merged) if merged else None
+        self.merged_at = self._strptime(pull.get('merged_at'))
         #: Whether the pull is deemed mergeable by GitHub
         self.mergeable = pull.get('mergeable', False)
         #: Whether it would be a clean merge or not
@@ -198,12 +194,12 @@ def __init__(self, pull, session=None):
         #: datetime object representing the last time the object was changed
         self.updated_at = self._strptime(pull.get('updated_at'))
         #: :class:`User <github3.users.User>` object representing the creator
-        #  of the pull request
+        #: of the pull request
         self.user = pull.get('user')
         if self.user:
             self.user = User(self.user, self)
         #: :class:`User <github3.users.User>` object representing the assignee
-        #  of the pull request
+        #: of the pull request
         self.assignee = pull.get('assignee')
         if self.assignee:
             self.assignee = User(self.assignee, self)
diff --git a/github3/repos/branch.py b/github3/repos/branch.py
@@ -15,7 +15,7 @@ def __init__(self, branch, session=None):
         #: Name of the branch.
         self.name = branch.get('name')
         #: Returns the branch's :class:`RepoCommit <RepoCommit>` or
-        #  ``None``.
+        #: ``None``.
         self.commit = branch.get('commit')
         if self.commit:
             self.commit = RepoCommit(self.commit, self._session)
diff --git a/github3/repos/comment.py b/github3/repos/comment.py
@@ -41,9 +41,7 @@ def __init__(self, comment, session=None):
         #: The position in the diff where the comment was made.
         self.position = comment.get('position')
         #: datetime object representing when the comment was updated.
-        self.updated_at = comment.get('updated_at')
-        if self.updated_at:
-            self.updated_at = self._strptime(self.updated_at)
+        self.updated_at = self._strptime(comment.get('updated_at'))
         #: Login of the user who left the comment.
         self.user = None
         if comment.get('user'):
diff --git a/github3/repos/comparison.py b/github3/repos/comparison.py
@@ -43,7 +43,7 @@ def __init__(self, compare):
         #: Patch URL at GitHub for the comparison.
         self.patch_url = compare.get('patch_url')
         #: :class:`RepoCommit <RepoCommit>` object representing the base of
-        #  comparison.
+        #: comparison.
         self.base_commit = RepoCommit(compare.get('base_commit'), None)
         #: Behind or ahead.
         self.status = compare.get('status')
diff --git a/github3/repos/deployment.py b/github3/repos/deployment.py
@@ -30,14 +30,10 @@ def __init__(self, deployment, session=None):
         self.payload = deployment.get('payload')
 
         #: Date the Deployment was created
-        self.created_at = deployment.get('created_at')
-        if self.created_at:
-            self.created_at = self._strptime(self.created_at)
+        self.created_at = self._strptime(deployment.get('created_at'))
 
         #: Date the Deployment was updated
-        self.updated_at = deployment.get('updated_at')
-        if self.updated_at:
-            self.updated_at = self._strptime(self.updated_at)
+        self.updated_at = self._strptime(deployment.get('updated_at'))
 
         #: Description of the deployment
         self.description = deployment.get('description')
@@ -109,14 +105,10 @@ def __init__(self, status, session=None):
         self.target_url = status.get('target_url')
 
         #: Date the deployment status was created
-        self.created_at = status.get('created_at')
-        if self.created_at:
-            self.created_at = self._strptime(self.created_at)
+        self.created_at = self._strptime(status.get('created_at'))
 
         #: Date the deployment status was updated
-        self.updated_at = status.get('updated_at')
-        if self.updated_at:
-            self.updated_at = self._strptime(self.updated_at)
+        self.updated_at = self._strptime(status.get('updated_at'))
 
         #: Description of the deployment
         self.description = status.get('description')
diff --git a/github3/repos/hook.py b/github3/repos/hook.py
@@ -33,9 +33,7 @@ def __init__(self, hook, session=None):
         super(Hook, self).__init__(hook, session)
         self._api = hook.get('url', '')
         #: datetime object representing when this hook was last updated.
-        self.updated_at = None
-        if hook.get('updated_at'):
-            self.updated_at = self._strptime(hook.get('updated_at'))
+        self.updated_at = self._strptime(hook.get('updated_at'))
         #: datetime object representing the date the hook was created.
         self.created_at = self._strptime(hook.get('created_at'))
         #: The name of the hook.
diff --git a/github3/repos/repo.py b/github3/repos/repo.py
@@ -115,13 +115,13 @@ def __init__(self, repo, session=None):
 
         # Repository owner's name
         #: :class:`User <github3.users.User>` object representing the
-        #  repository owner.
+        #: repository owner.
         self.owner = User(repo.get('owner', {}), self._session)
 
         #: Is this repository private?
         self.private = repo.get('private')
         #: ``datetime`` object representing the last time commits were pushed
-        #  to the repository.
+        #: to the repository.
         self.pushed_at = self._strptime(repo.get('pushed_at'))
         #: Size of the repository.
         self.size = repo.get('size', 0)
@@ -136,7 +136,7 @@ def __init__(self, repo, session=None):
         #: If it exists, url to clone the repository via SVN.
         self.svn_url = repo.get('svn_url', '')
         #: ``datetime`` object representing the last time the repository was
-        #  updated.
+        #: updated.
         self.updated_at = self._strptime(repo.get('updated_at'))
         self._api = repo.get('url', '')
 
diff --git a/github3/repos/status.py b/github3/repos/status.py
@@ -33,9 +33,7 @@ def __init__(self, status):
         #: URL to view more information about the status
         self.target_url = status.get('target_url')
         #: datetime object representing the last time the status was updated
-        self.updated_at = None
-        if status.get('updated_at'):
-            self.updated_at = self._strptime(status.get('updated_at'))
+        self.updated_at = self._strptime(status.get('updated_at'))
 
     def _repr(self):
         return '<Status [{s.id}:{s.state}]>'.format(s=self)
