Update checked in version of gsutil to version 4.6

third_party/boto/tests/integration/s3/test_key.py

 # -*- coding: utf-8 -*-
 # Copyright (c) 2012 Mitch Garnaat http://garnaat.org/
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
@@ skipping 383 matching lines @@
         key.set_metadata('Content-md5', 'XmUKnus7svY1frWsVskxXg==')
         key.set_contents_from_string('{"abc": 123}')
 
         check = self.bucket.get_key('test_header_case')
         self.assertEqual(check.content_type, 'application/json')
 
     def test_header_encoding(self):
         key = self.bucket.new_key('test_header_encoding')
 
         key.set_metadata('Cache-control', 'public, max-age=500')
+        key.set_metadata('Test-Plus', u'A plus (+)')
         key.set_metadata('Content-disposition', u'filename=Schöne Zeit.txt')
         key.set_contents_from_string('foo')
 
         check = self.bucket.get_key('test_header_encoding')
 
         self.assertEqual(check.cache_control, 'public, max-age=500')
-        self.assertEqual(check.content_disposition, 'filename=Sch%C3%B6ne+Zeit.txt')
+        self.assertEqual(check.get_metadata('test-plus'), 'A plus (+)')
+        self.assertEqual(check.content_disposition, 'filename=Sch%C3%B6ne%20Zeit.txt')
         self.assertEqual(
-            urllib.unquote_plus(check.content_disposition).decode('utf-8'),
+            urllib.unquote(check.content_disposition).decode('utf-8'),
             'filename=Schöne Zeit.txt'.decode('utf-8')
         )