mirror of
https://github.com/taigrr/wtf
synced 2025-01-18 04:03:14 -08:00
Revert "Update dependencies"
This commit is contained in:
3
vendor/google.golang.org/api/gensupport/resumable.go
generated
vendored
3
vendor/google.golang.org/api/gensupport/resumable.go
generated
vendored
@@ -5,13 +5,14 @@
|
||||
package gensupport
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
3
vendor/google.golang.org/api/gensupport/retry.go
generated
vendored
3
vendor/google.golang.org/api/gensupport/retry.go
generated
vendored
@@ -15,11 +15,12 @@
|
||||
package gensupport
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
// Retry invokes the given function, retrying it multiple times if the connection failed or
|
||||
|
||||
26
vendor/google.golang.org/api/gensupport/send.go
generated
vendored
26
vendor/google.golang.org/api/gensupport/send.go
generated
vendored
@@ -5,10 +5,12 @@
|
||||
package gensupport
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"golang.org/x/net/context"
|
||||
"golang.org/x/net/context/ctxhttp"
|
||||
)
|
||||
|
||||
// Hook is the type of a function that is called once before each HTTP request
|
||||
@@ -30,8 +32,7 @@ func RegisterHook(h Hook) {
|
||||
|
||||
// SendRequest sends a single HTTP request using the given client.
|
||||
// If ctx is non-nil, it calls all hooks, then sends the request with
|
||||
// req.WithContext, then calls any functions returned by the hooks in
|
||||
// reverse order.
|
||||
// ctxhttp.Do, then calls any functions returned by the hooks in reverse order.
|
||||
func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
|
||||
// Disallow Accept-Encoding because it interferes with the automatic gzip handling
|
||||
// done by the default http.Transport. See https://github.com/google/google-api-go-client/issues/219.
|
||||
@@ -49,7 +50,7 @@ func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*
|
||||
}
|
||||
|
||||
// Send request.
|
||||
resp, err := send(ctx, client, req)
|
||||
resp, err := ctxhttp.Do(ctx, client, req)
|
||||
|
||||
// Call returned funcs in reverse order.
|
||||
for i := len(post) - 1; i >= 0; i-- {
|
||||
@@ -60,23 +61,6 @@ func SendRequest(ctx context.Context, client *http.Client, req *http.Request) (*
|
||||
return resp, err
|
||||
}
|
||||
|
||||
func send(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
|
||||
if client == nil {
|
||||
client = http.DefaultClient
|
||||
}
|
||||
resp, err := client.Do(req.WithContext(ctx))
|
||||
// If we got an error, and the context has been canceled,
|
||||
// the context's error is probably more useful.
|
||||
if err != nil {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
err = ctx.Err()
|
||||
default:
|
||||
}
|
||||
}
|
||||
return resp, err
|
||||
}
|
||||
|
||||
// DecodeResponse decodes the body of res into target. If there is no body,
|
||||
// target is unchanged.
|
||||
func DecodeResponse(target interface{}, res *http.Response) error {
|
||||
|
||||
Reference in New Issue
Block a user