[Python-modules-commits] [betamax] 02/09: Import betamax_0.7.1.orig.tar.gz

[Daniele Tricoli]

This is an automated email from the git hooks/post-receive script.

eriol-guest pushed a commit to branch master
in repository betamax.

commit 36b432a680726f52fa78fcc2b7045aa30779cdac
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Wed Jul 13 12:00:38 2016 +0200

    Import betamax_0.7.1.orig.tar.gz
---
 HISTORY.rst               | 6 ++++++
 PKG-INFO                  | 8 +++++++-
 betamax.egg-info/PKG-INFO | 8 +++++++-
 betamax/__init__.py       | 2 +-
 betamax/adapter.py        | 4 +++-
 setup.cfg                 | 2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index f613177..af5e772 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,12 @@
 History
 =======
 
+0.7.1 - 2016-06-14
+------------------
+
+- Fix issue #108 by effectively copying the items in the match_requests_on
+  list into the match_options set on a Cassette instance
+
 0.7.0 - 2016-04-29
 ------------------
 
diff --git a/PKG-INFO b/PKG-INFO
index 8a77cbd..4964dad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: betamax
-Version: 0.7.0
+Version: 0.7.1
 Summary: A VCR imitation for python-requests
 Home-page: https://github.com/sigmavirus24/betamax
 Author: Ian Cordasco
@@ -98,6 +98,12 @@ Description: betamax
         History
         =======
         
+        0.7.1 - 2016-06-14
+        ------------------
+        
+        - Fix issue #108 by effectively copying the items in the match_requests_on
+          list into the match_options set on a Cassette instance
+        
         0.7.0 - 2016-04-29
         ------------------
         
diff --git a/betamax.egg-info/PKG-INFO b/betamax.egg-info/PKG-INFO
index 8a77cbd..4964dad 100644
--- a/betamax.egg-info/PKG-INFO
+++ b/betamax.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: betamax
-Version: 0.7.0
+Version: 0.7.1
 Summary: A VCR imitation for python-requests
 Home-page: https://github.com/sigmavirus24/betamax
 Author: Ian Cordasco
@@ -98,6 +98,12 @@ Description: betamax
         History
         =======
         
+        0.7.1 - 2016-06-14
+        ------------------
+        
+        - Fix issue #108 by effectively copying the items in the match_requests_on
+          list into the match_options set on a Cassette instance
+        
         0.7.0 - 2016-04-29
         ------------------
         
diff --git a/betamax/__init__.py b/betamax/__init__.py
index 700165b..729eb93 100644
--- a/betamax/__init__.py
+++ b/betamax/__init__.py
@@ -22,5 +22,5 @@ __author__ = 'Ian Cordasco'
 __copyright__ = 'Copyright 2013-2014 Ian Cordasco'
 __license__ = 'Apache 2.0'
 __title__ = 'betamax'
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
diff --git a/betamax/adapter.py b/betamax/adapter.py
index 47425ba..8e8a0d2 100644
--- a/betamax/adapter.py
+++ b/betamax/adapter.py
@@ -94,7 +94,9 @@ class BetamaxAdapter(BaseAdapter):
         if 'record' in self.options:
             self.cassette.record_mode = self.options['record']
 
-        self.cassette.match_options = match_requests_on
+        # NOTE(sigmavirus24): Cassette.match_options is a set, might as well
+        # use that instead of overriding it.
+        self.cassette.match_options.update(match_requests_on)
 
         re_record_interval = timedelta.max
         if self.options.get('re_record_interval'):
diff --git a/setup.cfg b/setup.cfg
index 29d232e..bd35539 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,6 @@ universal = 1
 
 [egg_info]
 tag_svn_revision = 0
-tag_build = 
 tag_date = 0
+tag_build = 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/betamax.git