Skip to content

Commit a1ae214

Browse files
thaJeztahthaJeztah
authored
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]>
1 parent 504804f commit a1ae214

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+248
-284
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ code importing `appengine/datastore` will now need to import `google.golang.org/
5151
Most App Engine services are available with exactly the same API.
5252
A few APIs were cleaned up, and there are some differences:
5353

54-
* `appengine.Context` has been replaced with the `Context` type from `golang.org/x/net/context`.
54+
* `appengine.Context` has been replaced with the `Context` type from `context`.
5555
* Logging methods that were on `appengine.Context` are now functions in `google.golang.org/appengine/log`.
5656
* `appengine.Timeout` has been removed. Use `context.WithTimeout` instead.
5757
* `appengine.Datacenter` now takes a `context.Context` argument.

‎aetest/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package aetest
22

33
import (
4+
"context"
45
"io"
56
"net/http"
67
"time"
78

8-
"golang.org/x/net/context"
99
"google.golang.org/appengine"
1010
)
1111

‎appengine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package appengine // import "google.golang.org/appengine"
1010

1111
import (
12+
"context"
1213
"net/http"
1314

1415
"github.com/golang/protobuf/proto"
15-
"golang.org/x/net/context"
1616

1717
"google.golang.org/appengine/internal"
1818
)

‎blobstore/blobstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package blobstore // import "google.golang.org/appengine/blobstore"
99
import (
1010
"bufio"
1111
"bytes"
12+
"context"
1213
"encoding/base64"
1314
"fmt"
1415
"io"
@@ -23,7 +24,6 @@ import (
2324
"time"
2425

2526
"github.com/golang/protobuf/proto"
26-
"golang.org/x/net/context"
2727
"golang.org/x/text/encoding/htmlindex"
2828

2929
"google.golang.org/appengine"

‎blobstore/read.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
package blobstore
66

77
import (
8+
"context"
89
"errors"
910
"fmt"
1011
"io"
1112
"os"
1213
"sync"
1314

1415
"github.com/golang/protobuf/proto"
15-
"golang.org/x/net/context"
1616

1717
"google.golang.org/appengine"
1818
"google.golang.org/appengine/internal"

‎capability/capability.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Example:
1717
package capability // import "google.golang.org/appengine/capability"
1818

1919
import (
20-
"golang.org/x/net/context"
20+
"context"
2121

2222
"google.golang.org/appengine/internal"
2323
"google.golang.org/appengine/log"

‎channel/channel.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ https://cloud.google.com/appengine/docs/deprecations/channel
2525
package channel // import "google.golang.org/appengine/channel"
2626

2727
import (
28+
"context"
2829
"encoding/json"
2930

30-
"golang.org/x/net/context"
31-
3231
"google.golang.org/appengine"
3332
"google.golang.org/appengine/internal"
3433
basepb "google.golang.org/appengine/internal/base"

‎cmd/aefix/ae.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
const (
15-
ctxPackage = "golang.org/x/net/context"
15+
ctxPackage = "context"
1616

1717
newPackageBase = "google.golang.org/"
1818
stutterPackage = false

‎cmd/aefix/ae_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ func f(w http.ResponseWriter, r *http.Request) {
3838
Out: `package foo
3939
4040
import (
41+
"context"
4142
"net/http"
4243
"time"
4344
44-
"golang.org/x/net/context"
4545
"google.golang.org/appengine"
4646
"google.golang.org/appengine/datastore"
4747
"google.golang.org/appengine/log"
@@ -74,7 +74,7 @@ func LogSomething(c2 appengine.Context) {
7474
Out: `package foo
7575
7676
import (
77-
"golang.org/x/net/context"
77+
"context"
7878
"google.golang.org/appengine/log"
7979
)
8080
@@ -102,7 +102,7 @@ func f(ctx appengine.Context) {
102102
Out: `package foo
103103
104104
import (
105-
"golang.org/x/net/context"
105+
"context"
106106
"google.golang.org/appengine/taskqueue"
107107
)
108108
@@ -131,7 +131,7 @@ func f(ctx appengine.Context, w io.Writer) {
131131
Out: `package foo
132132
133133
import (
134-
"golang.org/x/net/context"
134+
"context"
135135
"google.golang.org/appengine"
136136
"io"
137137
)

‎datastore/datastore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package datastore
66

77
import (
8+
"context"
89
"errors"
910
"fmt"
1011
"reflect"
1112

1213
"github.com/golang/protobuf/proto"
13-
"golang.org/x/net/context"
1414

1515
"google.golang.org/appengine"
1616
"google.golang.org/appengine/internal"

‎datastore/key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package datastore
66

77
import (
88
"bytes"
9+
"context"
910
"encoding/base64"
1011
"encoding/gob"
1112
"errors"
@@ -14,7 +15,6 @@ import (
1415
"strings"
1516

1617
"github.com/golang/protobuf/proto"
17-
"golang.org/x/net/context"
1818

1919
"google.golang.org/appengine/internal"
2020
pb "google.golang.org/appengine/internal/datastore"

‎datastore/key_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ package datastore
66

77
import (
88
"bytes"
9+
"context"
910
"encoding/gob"
1011
"encoding/json"
1112
"testing"
1213

13-
"golang.org/x/net/context"
14-
1514
"google.golang.org/appengine/internal"
1615
)
1716

‎datastore/keycompat.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
package datastore
66

77
import (
8+
"context"
89
"sync"
910

10-
"golang.org/x/net/context"
11-
1211
"google.golang.org/appengine/datastore/internal/cloudkey"
1312
"google.golang.org/appengine/internal"
1413
)

‎datastore/metadata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package datastore
66

7-
import "golang.org/x/net/context"
7+
import "context"
88

99
// Datastore kinds for the metadata entities.
1010
const (

‎datastore/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package datastore
66

77
import (
8+
"context"
89
"encoding/base64"
910
"errors"
1011
"fmt"
@@ -13,7 +14,6 @@ import (
1314
"strings"
1415

1516
"github.com/golang/protobuf/proto"
16-
"golang.org/x/net/context"
1717

1818
"google.golang.org/appengine/internal"
1919
pb "google.golang.org/appengine/internal/datastore"

‎datastore/transaction.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
package datastore
66

77
import (
8+
"context"
89
"errors"
910

10-
"golang.org/x/net/context"
11-
1211
"google.golang.org/appengine/internal"
1312
pb "google.golang.org/appengine/internal/datastore"
1413
)

‎delay/delay.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ package delay // import "google.golang.org/appengine/delay"
5959

6060
import (
6161
"bytes"
62-
stdctx "context"
62+
"context"
6363
"encoding/gob"
6464
"errors"
6565
"fmt"
@@ -72,8 +72,6 @@ import (
7272
"runtime"
7373
"strings"
7474

75-
"golang.org/x/net/context"
76-
7775
"google.golang.org/appengine"
7876
"google.golang.org/appengine/internal"
7977
"google.golang.org/appengine/log"
@@ -109,12 +107,11 @@ var (
109107

110108
// context keys
111109
headersContextKey contextKey = 0
112-
stdContextType = reflect.TypeOf((*stdctx.Context)(nil)).Elem()
113-
netContextType = reflect.TypeOf((*context.Context)(nil)).Elem()
110+
stdContextType = reflect.TypeOf((*context.Context)(nil)).Elem()
114111
)
115112

116113
func isContext(t reflect.Type) bool {
117-
return t == stdContextType || t == netContextType
114+
return t == stdContextType
118115
}
119116

120117
var modVersionPat = regexp.MustCompile("@v[^/]+")

‎delay/delay_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package delay
66

77
import (
88
"bytes"
9-
stdctx "context"
9+
"context"
1010
"encoding/gob"
1111
"errors"
1212
"fmt"
@@ -18,7 +18,6 @@ import (
1818
"testing"
1919

2020
"github.com/golang/protobuf/proto"
21-
"golang.org/x/net/context"
2221

2322
"google.golang.org/appengine/internal"
2423
"google.golang.org/appengine/taskqueue"
@@ -107,7 +106,7 @@ var (
107106
})
108107

109108
stdCtxRuns = 0
110-
stdCtxFunc = Func("stdctx", func(c stdctx.Context) {
109+
stdCtxFunc = Func("stdctx", func(c context.Context) {
111110
stdCtxRuns++
112111
})
113112
)

‎demos/guestbook/guestbook.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
package main
1010

1111
import (
12+
"context"
1213
"html/template"
1314
"net/http"
1415
"time"
1516

16-
"golang.org/x/net/context"
17-
1817
"google.golang.org/appengine"
1918
"google.golang.org/appengine/datastore"
2019
"google.golang.org/appengine/log"

‎file/file.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
package file
77

88
import (
9+
"context"
910
"fmt"
1011

11-
"golang.org/x/net/context"
12-
1312
"google.golang.org/appengine/internal"
1413
aipb "google.golang.org/appengine/internal/app_identity"
1514
)

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ go 1.11
44

55
require (
66
github.com/golang/protobuf v1.5.2
7-
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
87
golang.org/x/text v0.3.6
98
)

‎go.sum

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
33
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
44
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
55
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6-
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
7-
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
8-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
116
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
127
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
138
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎identity.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
package appengine
66

77
import (
8+
"context"
89
"time"
910

10-
"golang.org/x/net/context"
11-
1211
"google.golang.org/appengine/internal"
1312
pb "google.golang.org/appengine/internal/app_identity"
1413
modpb "google.golang.org/appengine/internal/modules"

‎image/image.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
package image // import "google.golang.org/appengine/image"
77

88
import (
9+
"context"
910
"fmt"
1011
"net/url"
1112

12-
"golang.org/x/net/context"
13-
1413
"google.golang.org/appengine"
1514
"google.golang.org/appengine/internal"
1615
pb "google.golang.org/appengine/internal/image"

‎internal/aetesting/fake.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
package aetesting
88

99
import (
10+
"context"
1011
"fmt"
1112
"net/http"
1213
"reflect"
1314
"testing"
1415

1516
"github.com/golang/protobuf/proto"
16-
"golang.org/x/net/context"
1717

1818
"google.golang.org/appengine/internal"
1919
)

0 commit comments

Comments
 (0)