Updating to compile on weekly.2012-03-04

Author: paulbellamy

examples/cats.go

@@ -3,7 +3,7 @@ package main
 import (
   "mango"
   "cats_middleware"
-  "http"
+  "net/http"
   "os"
   "io/ioutil"
 )
@@ -39,4 +39,4 @@ func main() {
   stack.Middleware(cats_middleware) // Include the Cats middleware in our stack
 
   stack.Run(Hello)
-}
+}

jsonp_test.go

@@ -1,7 +1,7 @@
 package mango
 
 import (
-	"http"
+	"net/http"
 	"testing"
 	"runtime"
 )

logger_test.go

@@ -2,7 +2,7 @@ package mango
 
 import (
 	"bytes"
-	"http"
+	"net/http"
 	"log"
 	"testing"
 	"runtime"

mango.go

@@ -3,7 +3,7 @@ package mango
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 	"log"
 	"net/textproto"
 	"os"
@@ -138,7 +138,7 @@ func (this *Stack) HandlerFunc(app App) http.HandlerFunc {
 	}
 }
 
-func (this *Stack) Run(app App) os.Error {
+func (this *Stack) Run(app App) error {
 	if this.Address == "" {
 		this.Address = "0.0.0.0:8000"
 	}

mango_test.go

@@ -1,11 +1,11 @@
 package mango
 
 import (
-	"http/httptest"
+	"net/http/httptest"
 	"io/ioutil"
 	"testing"
 	"fmt"
-	"http"
+	"net/http"
 	"runtime"
 )
 

mime_test.go

@@ -53,7 +53,7 @@ func TestRemovingMimeTypes(t *testing.T) {
 		t.Error("Expected", value, "to have mime type:", expected, "got:", found)
 	}
 
-	MimeTypes[".jpg"] = "", false
+	delete(MimeTypes, ".jpg")
 
 	found = MimeType(value, fallback)
 	if found != fallback {

redirect_test.go

@@ -1,7 +1,7 @@
 package mango
 
 import (
-	"http"
+	"net/http"
 	"testing"
 	"runtime"
 )

routing_test.go

@@ -1,7 +1,7 @@
 package mango
 
 import (
-	"http"
+	"net/http"
 	"testing"
 	"runtime"
 )

sessions.go

@@ -4,18 +4,19 @@ import (
 	"bytes"
 	"hash"
 	"crypto/hmac"
+	"crypto/sha1"
 	"encoding/base64"
 	"fmt"
 	"io/ioutil"
-	"gob"
-	"http"
+	"encoding/gob"
+	"net/http"
 	"strings"
 )
 
 func hashCookie(data, secret string) (sum string) {
-	var h hash.Hash = hmac.NewSHA1([]byte(secret))
+	var h hash.Hash = hmac.New(sha1.New, []byte(secret))
 	h.Write([]byte(data))
-	return string(h.Sum())
+	return string(h.Sum(nil))
 }
 
 func verifyCookie(data, secret, sum string) bool {

sessions_test.go

@@ -1,7 +1,7 @@
 package mango
 
 import (
-	"http"
+	"net/http"
 	"runtime"
 	"strings"
 	"testing"

show_errors.go

@@ -3,7 +3,7 @@ package mango
 import (
 	"bytes"
 	"fmt"
-	"template"
+	"html/template"
 )
 
 func ShowErrors(templateString string) Middleware {

show_errors_test.go

@@ -1,7 +1,7 @@
 package mango
 
 import (
-	"http"
+	"net/http"
 	"testing"
 	"runtime"
 )

static.go

@@ -6,18 +6,22 @@ import (
 	"os"
 )
 
+func fileIsRegular(fi os.FileInfo) bool {
+  return fi.Mode() & (os.ModeDir | os.ModeSymlink | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice) == 0
+}
+
 func fileExists(filename string) bool {
 	info, err := os.Stat(filename)
 	if err != nil {
 		return false
-	} else if !info.IsRegular() {
-		return false
-	}
+	} else if !fileIsRegular(info) {
+    return false
+  }
 
 	return true
 }
 
-func readFile(filename string) (string, os.Error) {
+func readFile(filename string) (string, error) {
 	body, err := ioutil.ReadFile(filename)
 	return string(body), err
 }

static_test.go

@@ -2,7 +2,7 @@ package mango
 
 import (
 	"bytes"
-	"http"
+	"net/http"
 	"io/ioutil"
 	"testing"
 	"runtime"