[vpython] Fix PEP425 naming.

vpython/venv/venv.go

 // Copyright 2017 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package venv
 
 import (
         "bytes"
         "encoding/json"
         "io/ioutil"
@@ skipping 548 matching lines @@
         if err := cmd.Run(); err != nil {
                 return errors.Annotate(err).Reason("failed to create VirtualEnv").Err()
         }
 
         return nil
 }
 
 // getPEP425Tags calls Python's pip.pep425tags package to retrieve the tags.
 //
 // This must be run while "pip" is installed in the VirtualEnv.
-func (e *Env) getPEP425Tags(c context.Context) ([]*vpython.Pep425Tag, error) {
+func (e *Env) getPEP425Tags(c context.Context) ([]*vpython.PEP425Tag, error) {
         // This script will return a list of 3-entry lists:
         // [0]: version (e.g., "cp27")
         // [1]: abi (e.g., "cp27mu", "none")
         // [2]: arch (e.g., "x86_64", "armv7l", "any")
         const script = `import json;` +
                 `import pip.pep425tags;` +
                 `import sys;` +
                 `sys.stdout.write(json.dumps(pip.pep425tags.get_supported()))`
         type pep425TagEntry []string
 
         cmd := e.Interpreter().IsolatedCommand(c, "-c", script)
 
         var stdout bytes.Buffer
         cmd.Stdout = &stdout
 
         attachOutputForLogging(c, logging.Debug, cmd)
         if err := cmd.Run(); err != nil {
                 return nil, errors.Annotate(err).Reason("failed to get PEP425 tags").Err()
         }
 
         var tagEntries []pep425TagEntry
         if err := json.Unmarshal(stdout.Bytes(), &tagEntries); err != nil {
                 return nil, errors.Annotate(err).Reason("failed to unmarshal PEP425 tag output: %(output)s").
                         D("output", stdout.String()).
                         Err()
         }
 
-        tags := make([]*vpython.Pep425Tag, len(tagEntries))
+        tags := make([]*vpython.PEP425Tag, len(tagEntries))
         for i, te := range tagEntries {
                 if len(te) != 3 {
                         return nil, errors.Reason("invalid PEP425 tag entry: %(entry)v").
                                 D("entry", te).
                                 D("index", i).
                                 Err()
                 }
 
-                tags[i] = &vpython.Pep425Tag{
-                        Version: te[0],
-                        Abi:     te[1],
-                        Arch:    te[2],
+                tags[i] = &vpython.PEP425Tag{
+                        Python:   te[0],
+                        Abi:      te[1],
+                        Platform: te[2],
                 }
         }
 
         // If we're Debug-logging, calculate and display the tags that were probed.
         if logging.IsLogging(c, logging.Debug) {
                 tagStr := make([]string, len(tags))
                 for i, t := range tags {
                         tagStr[i] = t.TagString()
                 }
                 logging.Debugf(c, "Loaded PEP425 tags: [%s]", strings.Join(tagStr, ", "))
@@ skipping 152 matching lines @@
 // panic, since the locking state can no longer be determined.
 func mustReleaseLock(c context.Context, lock fslock.Handle, fn func() error) error {
         defer func() {
                 if err := lock.Unlock(); err != nil {
                         errors.Log(c, errors.Annotate(err).Reason("failed to release lock").Err())
                         panic(err)
                 }
         }()
         return fn()
 }