From 739be790421708e4e5a3825d58cab10c119d31cc Mon Sep 17 00:00:00 2001
From: Mikhail Sobolev <mss@mawhrin.net>
Date: Fri, 15 Aug 2014 17:31:47 +0300
Subject: [PATCH] a bit of cleanup

* remove unused self._token
* simplify expressions for sha, startDescription, endDescription
* re-format addErrback
* change import for datetime to simplify its usage
---
 master/buildbot/status/github.py              | 48 +++++++------------
 .../buildbot/test/unit/test_status_github.py  |  1 -
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/master/buildbot/status/github.py b/master/buildbot/status/github.py
index fde86a67147..efec4389dd2 100644
--- a/master/buildbot/status/github.py
+++ b/master/buildbot/status/github.py
@@ -14,7 +14,7 @@
 # Copyright Buildbot Team Members
 from __future__ import absolute_import
 
-import datetime
+from datetime import datetime
 
 from twisted.internet import defer
 from twisted.python import log
@@ -52,22 +52,13 @@ def __init__(self, token, repoOwner, repoName, sha=None,
 
         StatusReceiverMultiService.__init__(self)
 
-        if not sha:
-            sha = Interpolate("%(src::revision)s")
-
-        if not startDescription:
-            startDescription = "Build started."
-        self._startDescription = startDescription
-
-        if not endDescription:
-            endDescription = "Build done."
-        self._endDescription = endDescription
-
-        self._token = token
-        self._sha = sha
+        self._sha = sha or Interpolate("%(src::revision)s")
         self._repoOwner = repoOwner
         self._repoName = repoName
-        self._github = GitHubAPI(oauth2_token=self._token, baseURL=baseURL)
+        self._startDescription = startDescription or "Build started."
+        self._endDescription = endDescription or "Build done."
+
+        self._github = GitHubAPI(oauth2_token=token, baseURL=baseURL)
 
     def startService(self):
         StatusReceiverMultiService.startService(self)
@@ -89,10 +80,9 @@ def buildStarted(self, builderName, build):
         See: C{IStatusReceiver}.
         """
         d = self._sendStartStatus(builderName, build)
-        d.addErrback(
-            log.err,
-            'While sending start status to GitHub for %s.' % (
-                builderName))
+        d.addErrback(log.err,
+                     'While sending start status to GitHub for %s.' %
+                     (builderName,))
 
     @defer.inlineCallbacks
     def _sendStartStatus(self, builderName, build):
@@ -111,8 +101,7 @@ def _sendStartStatus(self, builderName, build):
             'state': 'pending',
             'description': description,
             'builderName': builderName,
-            'startDateTime': datetime.datetime.fromtimestamp(
-                startTime).isoformat(' '),
+            'startDateTime': datetime.fromtimestamp(startTime).isoformat(' '),
             'endDateTime': 'In progress',
             'duration': 'In progress',
         })
@@ -124,10 +113,9 @@ def buildFinished(self, builderName, build, results):
         See: C{IStatusReceiver}.
         """
         d = self._sendFinishStatus(builderName, build, results)
-        d.addErrback(
-            log.err,
-            'While sending finish status to GitHub for %s.' % (
-                builderName))
+        d.addErrback(log.err,
+                     'While sending finish status to GitHub for %s.' %
+                     (builderName,))
 
     @defer.inlineCallbacks
     def _sendFinishStatus(self, builderName, build, results):
@@ -147,10 +135,8 @@ def _sendFinishStatus(self, builderName, build, results):
             'state': state,
             'description': description,
             'builderName': builderName,
-            'startDateTime': datetime.datetime.fromtimestamp(
-                startTime).isoformat(' '),
-            'endDateTime': datetime.datetime.fromtimestamp(
-                endTime).isoformat(' '),
+            'startDateTime': datetime.fromtimestamp(startTime).isoformat(' '),
+            'endDateTime': datetime.fromtimestamp(endTime).isoformat(' '),
             'duration': duration,
         })
 
@@ -161,8 +147,8 @@ def _timeDeltaToHumanReadable(self, start, end):
         """
         Return a string of human readable time delta.
         """
-        start_date = datetime.datetime.fromtimestamp(start)
-        end_date = datetime.datetime.fromtimestamp(end)
+        start_date = datetime.fromtimestamp(start)
+        end_date = datetime.fromtimestamp(end)
         delta = end_date - start_date
 
         result = []
diff --git a/master/buildbot/test/unit/test_status_github.py b/master/buildbot/test/unit/test_status_github.py
index 2b18e260665..d81dc46860a 100644
--- a/master/buildbot/test/unit/test_status_github.py
+++ b/master/buildbot/test/unit/test_status_github.py
@@ -119,7 +119,6 @@ def test_initialization_required_arguments(self):
         status = GitHubStatus(
             token=token, repoOwner=repoOwner, repoName=repoName)
 
-        self.assertEqual(token, status._token)
         self.assertEqual(repoOwner, status._repoOwner)
         self.assertEqual(repoName, status._repoName)