From e000e3cac19e62dd1213a080afbe752b6d9c5998 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 7 Apr 2016 11:57:48 +1000 Subject: [PATCH] webdav: remove runtime check for Go 1.4 or earlier. During the Go 1.5 development cycle, this package used to require the standard library's encoding/xml package from Go 1.5 or later, but https://go-review.googlesource.com/#/c/12772/ (which was submitted in July 2015) made an internal fork of encoding/xml, as some namespace related changes introduced in the Go 1.5 cycle were rolled back in response to https://github.com/golang/go/issues/11841 Thus, this "go1.4" runtime check is no longer necessary. In the long term, this package should use the standard library's version, and the internal fork deleted, once https://github.com/golang/go/issues/13400 is resolved. We could re-introduce a similar check at that time, although it could be done at compile time (via a "go1.7" build tag) instead of at runtime. Change-Id: I18258443aa3d9b519e23106aedb189f25c35495d Reviewed-on: https://go-review.googlesource.com/21634 Reviewed-by: Andrew Gerrand --- webdav/webdav.go | 21 --------------------- webdav/xml_test.go | 4 ---- 2 files changed, 25 deletions(-) diff --git a/webdav/webdav.go b/webdav/webdav.go index df6ef4501..65952d753 100644 --- a/webdav/webdav.go +++ b/webdav/webdav.go @@ -9,35 +9,14 @@ import ( "errors" "fmt" "io" - "log" "net/http" "net/url" "os" "path" - "runtime" "strings" "time" ) -// Package webdav's XML output requires the standard library's encoding/xml -// package version 1.5 or greater. Otherwise, it will produce malformed XML. -// -// As of May 2015, the Go stable release is version 1.4, so we print a message -// to let users know that this golang.org/x/etc package won't work yet. -// -// This package also won't work with Go 1.3 and earlier, but making this -// runtime version check catch all the earlier versions too, and not just -// "1.4.x", isn't worth the complexity. -// -// TODO: delete this check at some point after Go 1.5 is released. -var go1Dot4 = strings.HasPrefix(runtime.Version(), "go1.4.") - -func init() { - if go1Dot4 { - log.Println("package webdav requires Go version 1.5 or greater") - } -} - type Handler struct { // Prefix is the URL path prefix to strip from WebDAV resource paths. Prefix string diff --git a/webdav/xml_test.go b/webdav/xml_test.go index bc5641f45..f38504e9e 100644 --- a/webdav/xml_test.go +++ b/webdav/xml_test.go @@ -348,10 +348,6 @@ func TestReadPropfind(t *testing.T) { } func TestMultistatusWriter(t *testing.T) { - if go1Dot4 { - t.Skip("TestMultistatusWriter requires Go version 1.5 or greater") - } - ///The "section x.y.z" test cases come from section x.y.z of the spec at // http://www.webdav.org/specs/rfc4918.html testCases := []struct {