diff options
author | Niall Sheridan <nsheridan@gmail.com> | 2016-09-03 20:56:02 +0100 |
---|---|---|
committer | Niall Sheridan <nsheridan@gmail.com> | 2016-09-03 21:16:02 +0100 |
commit | 84e4e2d56d3e2878741a2d03a98d4739db8dbd50 (patch) | |
tree | df9d3e92071291fd154f149072e470d8cecbfd11 /vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go | |
parent | eb9015e8f6f92e3e4421ddaf74ad20960723596c (diff) |
Update dependencies
Also tweak travis config
Diffstat (limited to 'vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go')
-rw-r--r-- | vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go b/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go index eff260a..2e70b81 100644 --- a/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go +++ b/vendor/google.golang.org/api/googleapi/internal/uritemplates/utils.go @@ -4,10 +4,14 @@ package uritemplates -func Expand(path string, values map[string]string) (string, error) { +// Expand parses then expands a URI template with a set of values to produce +// the resultant URI. Two forms of the result are returned: one with all the +// elements escaped, and one with the elements unescaped. +func Expand(path string, values map[string]string) (escaped, unescaped string, err error) { template, err := parse(path) if err != nil { - return "", err + return "", "", err } - return template.Expand(values), nil + escaped, unescaped = template.Expand(values) + return escaped, unescaped, nil } |