From 0c6990bc9505ac1c9602be3c41592a9a95d4b92f Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 5 Sep 2016 16:08:17 +0100
Subject: [PATCH] gcs: Fix compile after removal of SetOpaque

It turns out that the SetOpaque call isn't needed any more as Google
aren't returning paths with `%2F` in any more so remove the whole
complication.

Fixes #676
Fixes #660
---
 googlecloudstorage/googlecloudstorage.go | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/googlecloudstorage/googlecloudstorage.go b/googlecloudstorage/googlecloudstorage.go
index d3cf44981..44c57d4b2 100644
--- a/googlecloudstorage/googlecloudstorage.go
+++ b/googlecloudstorage/googlecloudstorage.go
@@ -650,20 +650,10 @@ func (o *Object) Storable() bool {
 
 // Open an object for read
 func (o *Object) Open() (in io.ReadCloser, err error) {
-	// This is slightly complicated by Go here insisting on
-	// decoding the %2F in URLs into / which is legal in http, but
-	// unfortunately not what the storage server wants.
-	//
-	// So first encode all the % into their encoded form
-	// URL will decode them giving our original escaped string
-	url := strings.Replace(o.url, "%", "%25", -1)
-	req, err := http.NewRequest("GET", url, nil)
+	req, err := http.NewRequest("GET", o.url, nil)
 	if err != nil {
 		return nil, err
 	}
-	// SetOpaque sets Opaque such that HTTP requests to it don't
-	// alter any hex-escaped characters
-	googleapi.SetOpaque(req.URL)
 	req.Header.Set("User-Agent", fs.UserAgent)
 	res, err := o.fs.client.Do(req)
 	if err != nil {