From 97473bb8d8fedeb0365b4c003273d645ae208651 Mon Sep 17 00:00:00 2001
From: Derek Bekoe <debekoe@microsoft.com>
Date: Mon, 23 Jan 2017 14:54:26 -0800
Subject: [PATCH 1/3] Correctly patch HTTPConnection.request in Python 3.6

Fixes https://github.com/kevin1024/vcrpy/issues/293
---
 vcr/stubs/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcr/stubs/__init__.py b/vcr/stubs/__init__.py
index 4518243..c12e194 100644
--- a/vcr/stubs/__init__.py
+++ b/vcr/stubs/__init__.py
@@ -153,7 +153,7 @@ class VCRConnection(object):
         )
         return uri.replace(prefix, '', 1)
 
-    def request(self, method, url, body=None, headers=None):
+    def request(self, method, url, body=None, headers=None, *args, **kwargs):
         '''Persist the request metadata in self._vcr_request'''
         self._vcr_request = Request(
             method=method,

From 24b617a427e174aedb0acca6690bb163f51baf2c Mon Sep 17 00:00:00 2001
From: Derek Bekoe <debekoe@microsoft.com>
Date: Tue, 24 Jan 2017 13:57:37 -0800
Subject: [PATCH 2/3] Add Python 3.6 to CI

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b76b624..ee6caf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,7 @@ python:
 - 3.3
 - 3.4
 - 3.5
+- 3.6
 - pypy
 - pypy3
 install:

From 091b4025948a81b9e81e4fa49c6d2942500ff465 Mon Sep 17 00:00:00 2001
From: Derek Bekoe <debekoe@microsoft.com>
Date: Tue, 24 Jan 2017 16:26:02 -0800
Subject: [PATCH 3/3] Revert "Add Python 3.6 to CI"

This reverts commit 24b617a427e174aedb0acca6690bb163f51baf2c.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ee6caf7..b76b624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ python:
 - 3.3
 - 3.4
 - 3.5
-- 3.6
 - pypy
 - pypy3
 install: