Merge pull request docker-archive#33 from stevvooe/new-context

p9p: use new context package throughout
flynn · Nov 14, 2016 · 529e2b2 · 529e2b2
2 parents f717cf6 + be903fb
commit 529e2b2
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.6
+  - 1.7
 
 script:
   - go test -coverprofile=coverage.txt -covermode=atomic -race

diff --git a/channel.go b/channel.go
@@ -10,7 +10,7 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // Channel defines the operations necessary to implement a 9p message channel

diff --git a/client.go b/client.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"net"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 type client struct {

diff --git a/context.go b/context.go
@@ -1,7 +1,7 @@
 package p9p
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 type contextKey string

diff --git a/dispatcher.go b/dispatcher.go
@@ -1,6 +1,6 @@
 package p9p
 
-import "golang.org/x/net/context"
+import "context"
 
 // Handler defines an interface for 9p message handlers. A handler
 // implementation could be used to intercept calls of all types before sending

diff --git a/readdir.go b/readdir.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"io"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // ReaddirAll reads all the directory entries for the resource fid.

diff --git a/server.go b/server.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // TODO(stevvooe): Add net/http.Server-like type here to manage connections.

diff --git a/session.go b/session.go
@@ -1,6 +1,6 @@
 package p9p
 
-import "golang.org/x/net/context"
+import "context"
 
 // Session provides the central abstraction for a 9p connection. Clients
 // implement sessions and servers serve sessions. Sessions can be proxied by

diff --git a/transport.go b/transport.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"sync"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // roundTripper manages the request and response from the client-side. A

diff --git a/version.go b/version.go
@@ -3,7 +3,7 @@ package p9p
 import (
 	"fmt"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // NOTE(stevvooe): This file contains functions for negotiating version on the
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"net"
     	"time"
-    	"golang.org/x/net/context"
+    	"context"
     )
     // Channel defines the operations necessary to implement a 9p message channel
@@ Expand Down @@