From dc66a93e054c16f626fb39c3ec3aaa8e82f5dad0 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Mon, 2 Apr 2018 10:02:46 -0700 Subject: [PATCH] Revert "protoc-gen-go: use standard library context (requires Go1.9) (#548)" This reverts commit 3dc8a89f965ba7bf716fd0d92b83c5da1792ab9c. --- README.md | 2 +- protoc-gen-go/grpc/grpc.go | 2 +- protoc-gen-go/testdata/deprecated/deprecated.pb.go | 2 +- protoc-gen-go/testdata/grpc/grpc.pb.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 836cee4c47..01b29daf26 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Google's data interchange format. Copyright 2010 The Go Authors. https://github.com/golang/protobuf -This package and the code it generates requires at least Go 1.9. +This package and the code it generates requires at least Go 1.6. This software implements Go bindings for protocol buffers. For information about protocol buffers themselves, see diff --git a/protoc-gen-go/grpc/grpc.go b/protoc-gen-go/grpc/grpc.go index e30f9aeef9..1723680a8b 100644 --- a/protoc-gen-go/grpc/grpc.go +++ b/protoc-gen-go/grpc/grpc.go @@ -53,7 +53,7 @@ const generatedCodeVersion = 4 // Paths for packages used by code generated in this file, // relative to the import_prefix of the generator.Generator. const ( - contextPkgPath = "context" + contextPkgPath = "golang.org/x/net/context" grpcPkgPath = "google.golang.org/grpc" ) diff --git a/protoc-gen-go/testdata/deprecated/deprecated.pb.go b/protoc-gen-go/testdata/deprecated/deprecated.pb.go index e81f932d90..6ebae9da3a 100644 --- a/protoc-gen-go/testdata/deprecated/deprecated.pb.go +++ b/protoc-gen-go/testdata/deprecated/deprecated.pb.go @@ -12,7 +12,7 @@ import fmt "fmt" import math "math" import ( - context "context" + context "golang.org/x/net/context" grpc "google.golang.org/grpc" ) diff --git a/protoc-gen-go/testdata/grpc/grpc.pb.go b/protoc-gen-go/testdata/grpc/grpc.pb.go index ee68f477c7..0bb4cbfd1b 100644 --- a/protoc-gen-go/testdata/grpc/grpc.pb.go +++ b/protoc-gen-go/testdata/grpc/grpc.pb.go @@ -8,7 +8,7 @@ import fmt "fmt" import math "math" import ( - context "context" + context "golang.org/x/net/context" grpc "google.golang.org/grpc" )