Merge pull request #247 from sapk-fork/use-std-context

Migrate x/net/context to standard lib context
markbates · Oct 25, 2018 · bc6d8dd · bc6d8dd
2 parents 62aee22 + e17c589
commit bc6d8dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/provider.go b/provider.go
@@ -1,10 +1,10 @@
 package goth
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 

diff --git a/providers/cloudfoundry/cf.go b/providers/cloudfoundry/cf.go
@@ -4,15 +4,15 @@ package cloudfoundry
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
-	"fmt"
 	"github.com/markbates/goth"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 

diff --git a/providers/cloudfoundry/session.go b/providers/cloudfoundry/session.go
@@ -1,13 +1,13 @@
 package cloudfoundry
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"strings"
 	"time"
 
 	"github.com/markbates/goth"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )