- remove wrong fix

  (this corresponds to the currently running version of godoc)

R=r
DELTA=11  (0 added, 10 deleted, 1 changed)
OCL=28238
CL=28238

diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go
index 64add118560f748a10f653c32e062a504f182194..1d4eb5af3365a3c7169bd501c2712b32ae11a67e 100644 (file)
--- a/usr/gri/pretty/godoc.go
+++ b/usr/gri/pretty/godoc.go
@@ -554,17 +554,7 @@ func (p *pakDesc) Doc() (*doc.PackageDoc, *parseErrors) {
 
                if i == 0 {
                        // first file - initialize doc
-                       // canonicalize importpath
-                       // (e.g. such that "template/template" becomes just "template")
-                       // TODO This should not be needed here as similar functionality
-                       //      is elsewhere, but w/o this fix the output is incorrect
-                       //      for, say: "godoc template/template". Temporary work-around.
-                       path := p.importpath;
-                       dir, name := pathutil.Split(pathutil.Clean(path));
-                       if name == prog.Name.Value {
-                               path = pathutil.Clean(dir);
-                       }
-                       r.Init(prog.Name.Value, path);
+                       r.Init(prog.Name.Value, p.importpath);
                }
                i++;
                r.AddProgram(prog);