Merge branch 'master' into python3

diff --cc wrw/form.py
index 10b10f5,9f1e6d4..dbd0e02
--- 1/wrw/form.py
--- 2/wrw/form.py
+++ b/wrw/form.py
@@@ -111,17 -111,15 +111,18 @@@ class formpart(object)
          return self
  
      def __exit__(self, *excinfo):
+         self.close()
          return False
  
 -    def parsehead(self):
 +    def parsehead(self, charset):
          def headline():
              ln = self.readline(256)
 -            if ln[-1] != '\n':
 +            if ln[-1] != ord(b'\n'):
                  raise badmultipart("Too long header line in part")
 -            return ln.rstrip()
 +            try:
 +                return ln.decode(charset).rstrip()
 +            except UnicodeError:
 +                raise badmultipart("Form part header is not in assumed charset")
  
          ln = headline()
          while True: