remove golang.org/x/net dependency (#295)

* remove golang.org/x/net dependency

The golang.org/x/net/context package is an alias for stdlib context
since go1.7 (see https://go-review.googlesource.com/72570)

This patch replaces all uses of it for stdlib context.

Signed-off-by: Sebastiaan van Stijn <[email protected]>

* rename App Engine context type to remove import aliases

Signed-off-by: Sebastiaan van Stijn <[email protected]>

---------

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

README.md

@@ -51,7 +51,7 @@ code importing `appengine/datastore` will now need to import `google.golang.org/
 Most App Engine services are available with exactly the same API.
 A few APIs were cleaned up, and there are some differences:
 
-* `appengine.Context` has been replaced with the `Context` type from `golang.org/x/net/context`.
+* `appengine.Context` has been replaced with the `Context` type from `context`.
 * Logging methods that were on `appengine.Context` are now functions in `google.golang.org/appengine/log`.
 * `appengine.Timeout` has been removed. Use `context.WithTimeout` instead.
 * `appengine.Datacenter` now takes a `context.Context` argument.

aetest/instance.go

@@ -1,11 +1,11 @@
 package aetest
 
 import (
+	"context"
 	"io"
 	"net/http"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/appengine"
 )
 

appengine.go

@@ -9,10 +9,10 @@
 package appengine // import "google.golang.org/appengine"
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 
 	"google.golang.org/appengine/internal"
 )

blobstore/blobstore.go

@@ -9,6 +9,7 @@ package blobstore // import "google.golang.org/appengine/blobstore"
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/base64"
 	"fmt"
 	"io"
@@ -23,7 +24,6 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	"golang.org/x/text/encoding/htmlindex"
 
 	"google.golang.org/appengine"

blobstore/read.go

@@ -5,14 +5,14 @@
 package blobstore
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
 	"os"
 	"sync"
 
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

capability/capability.go

@@ -17,7 +17,7 @@ Example:
 package capability // import "google.golang.org/appengine/capability"
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"google.golang.org/appengine/internal"
 	"google.golang.org/appengine/log"

channel/channel.go

@@ -25,10 +25,9 @@ https://cloud.google.com/appengine/docs/deprecations/channel
 package channel // import "google.golang.org/appengine/channel"
 
 import (
+	"context"
 	"encoding/json"
 
-	"golang.org/x/net/context"
-
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
 	basepb "google.golang.org/appengine/internal/base"

cmd/aefix/ae.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	ctxPackage = "golang.org/x/net/context"
+	ctxPackage = "context"
 
 	newPackageBase = "google.golang.org/"
 	stutterPackage = false

cmd/aefix/ae_test.go

@@ -38,10 +38,10 @@ func f(w http.ResponseWriter, r *http.Request) {
 		Out: `package foo
 
 import (
+	"context"
 	"net/http"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/datastore"
 	"google.golang.org/appengine/log"
@@ -74,7 +74,7 @@ func LogSomething(c2 appengine.Context) {
 		Out: `package foo
 
 import (
-	"golang.org/x/net/context"
+	"context"
 	"google.golang.org/appengine/log"
 )
 
@@ -102,7 +102,7 @@ func f(ctx appengine.Context) {
 		Out: `package foo
 
 import (
-	"golang.org/x/net/context"
+	"context"
 	"google.golang.org/appengine/taskqueue"
 )
 
@@ -131,7 +131,7 @@ func f(ctx appengine.Context, w io.Writer) {
 		Out: `package foo
 
 import (
-	"golang.org/x/net/context"
+	"context"
 	"google.golang.org/appengine"
 	"io"
 )

datastore/datastore.go

@@ -5,12 +5,12 @@
 package datastore
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"reflect"
 
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"