From b0f30f97fbec04c1ab7cb8937f636822eab63885 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Fri, 10 Jul 2015 09:34:49 -0500
Subject: [PATCH 1/2] Fix flake8 tests using mock to work with 1.1.x branch

---
 flake8/tests/test_engine.py | 10 +++++-----
 tox.ini                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake8/tests/test_engine.py b/flake8/tests/test_engine.py
index 06fe62a..60b388c 100644
--- a/flake8/tests/test_engine.py
+++ b/flake8/tests/test_engine.py
@@ -52,7 +52,7 @@ class TestEngine(unittest.TestCase):
             self.assertTrue(len(registered_exts[0]) > 0)
             for i in registered_exts[1:]:
                 self.assertTrue(isinstance(i, list))
-            register_check.assert_called()
+            self.assertTrue(register_check.called)
 
     def test_get_parser(self):
         # setup
@@ -67,13 +67,13 @@ class TestEngine(unittest.TestCase):
         # actual call we're testing
         parser, hooks = engine.get_parser()
         # assertions
-        re.assert_called()
-        gpv.assert_called()
+        self.assertTrue(re.called)
+        self.assertTrue(gpv.called)
         pgp.assert_called_once_with(
             'flake8',
             '%s (pyflakes: 0.7, mccabe: 0.2) Python Version' % __version__)
-        m.remove_option.assert_called()
-        m.add_option.assert_called()
+        self.assertTrue(m.remove_option.called)
+        self.assertTrue(m.add_option.called)
         self.assertEqual(parser, m)
         self.assertEqual(hooks, [])
         # clean-up
diff --git a/tox.ini b/tox.ini
index 89f1fa4..73bec1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist =
 [testenv]
 usedevelop = True
 deps =
-    mock<1.1.0
+    mock
     nose
 commands =
     python setup.py test -q

From a4a4a48667cf6df12b4bdad68ceadd35ba71ae77 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Fri, 10 Jul 2015 09:46:57 -0500
Subject: [PATCH 2/2] Pin mock for py26

---
 tox.ini | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tox.ini b/tox.ini
index 73bec1f..2cffe80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,11 @@ commands =
     python setup.py flake8
     nosetests flake8.tests._test_warnings
 
+[testenv:py26]
+deps =
+  mock==1.0.1
+  nose
+
 [testenv:py27-flake8]
 basepython = python2.7
 deps =