[python-hdf5storage] 71/84: Made it so that Options would take additional keyword arguments even though it will ignore them to be more compatible with future versions of the package. (cherry picked from commit baffeb1896977e3870aa415c046fce6ce275c9f7)

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag 0.1.10
in repository python-hdf5storage.

commit 15cdeba7b44f198753064a39c06aded429a6dd4f
Author: Freja Nordsiek <fnordsie at gmail.com>
Date:   Fri Aug 21 17:49:33 2015 -0400

    Made it so that Options would take additional keyword arguments even though it will ignore them to be more compatible with future versions of the package.
    (cherry picked from commit baffeb1896977e3870aa415c046fce6ce275c9f7)
    
    Conflicts:
    	hdf5storage/__init__.py
    (cherry picked from commit 5c5e20a659639569930b300a7705c249a5e3f3e6)
    
    Conflicts:
    	hdf5storage/__init__.py
---
 hdf5storage/__init__.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/hdf5storage/__init__.py b/hdf5storage/__init__.py
index cd0fca0..59ae635 100644
--- a/hdf5storage/__init__.py
+++ b/hdf5storage/__init__.py
@@ -176,10 +176,6 @@ class Options(object):
                  complex_names=('r', 'i'),
                  group_for_references="/#refs#",
                  oned_as='row',
-<<<<<<< HEAD
-                 marshaller_collection=None,
-                 **keywords):
-=======
                  compress=True,
                  compress_size_threshold=16*1024,
                  compression_algorithm='gzip',
@@ -187,8 +183,9 @@ class Options(object):
                  shuffle_filter=True,
                  compressed_fletcher32_filter=True,
                  uncompressed_fletcher32_filter=False,
-                 marshaller_collection=None):
->>>>>>> b63e610... Added compression to Options and the Numpy marshaller.
+                 marshaller_collection=None,
+                 **keywords):
+
         # Set the defaults.
 
         self._store_python_metadata = True

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