@@ -1,9 +1,8 @@

 package client // import "github.com/docker/docker/client"

 import (

+	"context"

 	"net/url"

-

-	"golang.org/x/net/context"

 )

 // BuildCancel requests the daemon to cancel ongoing build request

@@ -1,6 +1,7 @@

 package client

 import (

+	"context"

 	"fmt"

 	"io/ioutil"

 	"net"

@@ -12,7 +13,6 @@ import (

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/pkg/errors"

-	"golang.org/x/net/context"

 	"gotest.tools/assert"

 )