Commit Martin's patch for pub + lib_v2.

utils/pub/http.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Helpers for dealing with HTTP.
 library pub.http;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:json';
 
 // TODO(nweiz): Make this import better.
 import '../../pkg/http/lib/http.dart' as http;
 import 'curl_client.dart';
 import 'io.dart';
 import 'log.dart' as log;
 
 // TODO(nweiz): make this configurable
@@ skipping 16 matching lines @@
     // TODO(nweiz): remove this when issue 4061 is fixed.
     var stackTrace;
     try {
       throw null;
     } catch (_, localStackTrace) {
       stackTrace = localStackTrace;
     }
 
     // TODO(nweiz): Ideally the timeout would extend to reading from the
     // response input stream, but until issue 3657 is fixed that's not feasible.
-    return timeout(inner.send(request).chain((streamedResponse) {
+    return timeout(inner.send(request).then((streamedResponse) {
       log.fine("Got response ${streamedResponse.statusCode} "
                "${streamedResponse.reasonPhrase}.");
 
       var status = streamedResponse.statusCode;
       // 401 responses should be handled by the OAuth2 client. It's very
       // unlikely that they'll be returned by non-OAuth2 requests.
       if (status < 400 || status == 401) {
         return new Future.immediate(streamedResponse);
       }
 
-      return http.Response.fromStream(streamedResponse).transform((response) {
+      return http.Response.fromStream(streamedResponse).then((response) {
         throw new PubHttpException(response);
       });
-    }).transformException((e) {
+    }).catchError((e) {
       if (e is SocketIOException &&
           e.osError != null &&
           (e.osError.errorCode == 8 ||
            e.osError.errorCode == -2 ||
            e.osError.errorCode == -5 ||
            e.osError.errorCode == 11004)) {
         throw 'Could not resolve URL "${request.url.origin}".';
       }
       throw e;
     }), HTTP_TIMEOUT, 'fetching URL "${request.url}"');
@@ skipping 56 matching lines @@
 
 /// Exception thrown when an HTTP operation fails.
 class PubHttpException implements Exception {
   final http.Response response;
 
   const PubHttpException(this.response);
 
   String toString() => 'HTTP error ${response.statusCode}: '
       '${response.reasonPhrase}';
 }