From dac160bf5c37e04962410ad9c87c9e3e7f9e2c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Sun, 3 May 2015 01:27:13 +0300
Subject: [PATCH] Fixed log message using nonexistent variables as input

---
 CHANGES                     | 1 +
 concurrent/futures/_base.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4d6d9fa..8f01fa7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
 
 - Dropped Python 2.5 and 3.1 support
 - Removed the deprecated "futures" top level package
+- Applied patch for issue 15015 (accessing an non-existing attribute)
 - Applied patch for issue 16284 (memory leak)
 
 
diff --git a/concurrent/futures/_base.py b/concurrent/futures/_base.py
index 4b20803..8299c79 100644
--- a/concurrent/futures/_base.py
+++ b/concurrent/futures/_base.py
@@ -490,8 +490,8 @@ class Future(object):
                 return True
             else:
                 LOGGER.critical('Future %s in unexpected state: %s',
-                                id(self.future),
-                                self.future._state)
+                                id(self),
+                                self._state)
                 raise RuntimeError('Future in unexpected state')
 
     def set_result(self, result):