Merge branch 'master' into python3

Conflicts:
	tornado/simple_httpclient.py
	tornado/web.py

diff --cc tornado/iostream.py
Simple merge

diff --cc tornado/options.py
Simple merge

diff --cc tornado/simple_httpclient.py
index ac4fb52657b1d179fa34b27e8e3bd605b5c9d1bf,906461bb576d43a6831e093715ba0d401831b4ce..2efe7e4455ec7c29616058a55a9b9be6e1a39052
--- 1/tornado/simple_httpclient.py
--- 2/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@@ -133,13 -127,12 +133,12 @@@ class _HTTPConnection(object)
          # Timeout handle returned by IOLoop.add_timeout
          self._timeout = None
          with stack_context.StackContext(self.cleanup):
 -            parsed = urlparse.urlsplit(self.request.url)
 +            parsed = urlparse.urlsplit(_unicode(self.request.url))
-             if ":" in parsed.netloc:
-                 host, _, port = parsed.netloc.partition(":")
-                 port = int(port)
-             else:
-                 host = parsed.netloc
+             host = parsed.hostname
+             if parsed.port is None:
                  port = 443 if parsed.scheme == "https" else 80
+             else:
+                 port = parsed.port
              if self.client.hostname_mapping is not None:
                  host = self.client.hostname_mapping.get(host, host)
  
@@@ -196,11 -189,16 +195,16 @@@
                  raise NotImplementedError('%s not supported' % key)
          if "Host" not in self.request.headers:
              self.request.headers["Host"] = parsed.netloc
-         if self.request.auth_username:
-             auth = utf8(self.request.auth_username) + b(":") + \
-                 utf8(self.request.auth_password)
-             self.request.headers["Authorization"] = \
-                 b("Basic ") + base64.b64encode(auth)
+         username, password = None, None
+         if parsed.username is not None:
+             username, password = parsed.username, parsed.password
+         elif self.request.auth_username is not None:
+             username = self.request.auth_username
+             password = self.request.auth_password
+         if username is not None:
 -            auth = "%s:%s" % (username, password)
 -            self.request.headers["Authorization"] = ("Basic %s" %
++            auth = utf8(username) + b(":") + utf8(password)
++            self.request.headers["Authorization"] = (b("Basic ") +
+                                                      base64.b64encode(auth))
          if self.request.user_agent:
              self.request.headers["User-Agent"] = self.request.user_agent
          has_body = self.request.method in ("POST", "PUT")
@@@ -217,14 -215,17 +221,17 @@@
              self.request.headers["Accept-Encoding"] = "gzip"
          req_path = ((parsed.path or '/') +
                  (('?' + parsed.query) if parsed.query else ''))
 -        request_lines = ["%s %s HTTP/1.1" % (self.request.method,
 -                                             req_path)]
 +        request_lines = [utf8("%s %s HTTP/1.1" % (self.request.method,
 +                                                  req_path))]
          for k, v in self.request.headers.get_all():
-             request_lines.append(utf8(k) + b(": ") + utf8(v))
 -            line = "%s: %s" % (k, v)
 -            if '\n' in line:
++            line = utf8(k) + b(": ") + utf8(v)
++            if b('\n') in line:
+                 raise ValueError('Newline in header: ' + repr(line))
+             request_lines.append(line)
 -        self.stream.write("\r\n".join(request_lines) + "\r\n\r\n")
 +        self.stream.write(b("\r\n").join(request_lines) + b("\r\n\r\n"))
          if has_body:
 -            self.stream.write(self.request.body)
 -        self.stream.read_until("\r\n\r\n", self._on_headers)
 +            self.stream.write(utf8(self.request.body))
 +        self.stream.read_until(b("\r\n\r\n"), self._on_headers)
  
      @contextlib.contextmanager
      def cleanup(self):

diff --cc tornado/test/simple_httpclient_test.py
Simple merge

diff --cc tornado/web.py
index 9608908aa722cfbac3d160523ede589b19b4f1aa,c30c9851f8b4cd55a22335383f4c3a14191bb83e..5a021f334f0357fdbdd346758f436775fa6063e2
--- 1/tornado/web.py
--- 2/tornado/web.py
+++ b/tornado/web.py
@@@ -450,9 -443,11 +450,11 @@@ class RequestHandler(object)
                  else:
                      css_files.extend(file_part)
              head_part = module.html_head()
 -            if head_part: html_heads.append(_utf8(head_part))
 +            if head_part: html_heads.append(utf8(head_part))
              body_part = module.html_body()
 -            if body_part: html_bodies.append(_utf8(body_part))
 +            if body_part: html_bodies.append(utf8(body_part))
+         def is_absolute(path):
+             return any(path.startswith(x) for x in ["/", "http:", "https:"])
          if js_files:
              # Maintain order of JavaScript files given by modules
              paths = []