fix a bug with redirects

server/scripts/redirector.py

 # 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.
 
 import logging
 import re
 import json
 from webapp2 import *
 from datetime import datetime, timedelta
 from google.appengine.ext import blobstore
 from google.appengine.ext.webapp import blobstore_handlers
 from google.appengine.api import memcache
 import cloudstorage
 
 ONE_HOUR = 60 * 60
 ONE_DAY = ONE_HOUR * 24
 ONE_WEEK = ONE_DAY * 7
 
 # for redirects below
 ONLY_DART_LIB = re.compile("^dart:([a-zA-Z0-9_]+)$")
-LIB_NAME_AND_CLASS_NAME = re.compile("^dart:([^\.]+)\.(.+)$")
+LIB_NAME_AND_CLASS_NAME = re.compile("^dart[:-]([^\.]+)\.(.+)$")
 
 class VersionInfo(object):
   """Small helper class holding information about the last version seen and the
   last time the version was checked for."""
   def __init__(self, update_interval):
     # The most recent version for this channel.
     self.version = None
     # The time this version was found.
     self.last_check = None
     self.update_interval = update_interval
@@ skipping 226 matching lines @@
 def redir_dev_path(handler, *args, **kwargs):
   postfix = kwargs['path'][1:]
   return redir_channel_latest('dev', postfix)
 
 def redir_be_path(handler, *args, **kwargs):
   postfix = kwargs['path'][1:]
   return redir_channel_latest('be', postfix)
 
 # /apidocs/channels/stable/dartdoc-viewer/home => /stable
 # /apidocs/channels/stable/dartdoc-viewer/dart:math => /stable/dart-math/dart-math-library.html
-# /apidocs/channels/stable/dartdoc-viewer/dart:async.Future => /stable/dart-async/Future.html
+# /apidocs/channels/stable/dartdoc-viewer/dart[:-]async.Future => /stable/dart-async/Future-class.html
 def redir_name(handler, *args, **kwargs):
   channel = kwargs['channel']
   postfix = kwargs['path'][1:]
 
   # /apidocs/channels/stable/dartdoc-viewer/home => /stable
   # /apidocs/channels/stable/dartdoc-viewer/ => /stable
   # /apidocs/channels/stable/dartdoc-viewer => /stable
   if postfix == 'home' or postfix == '':
     return '/%s' % (channel)
 
   # /apidocs/channels/stable/dartdoc-viewer/dart:math => /stable/dart-math/dart-math-library.html
   is_lib_page = ONLY_DART_LIB.match(postfix)
   if is_lib_page:
     name = postfix.replace(':', '-')
     return '/%s/%s/%s-library.html' % (channel, name, name)
 
-  # /apidocs/channels/stable/dartdoc-viewer/dart:async.Future => /stable/dart-async/Future-class.html
+  # /apidocs/channels/stable/dartdoc-viewer/dart[:-]async.Future => /stable/dart-async/Future-class.html
   is_lib_and_class = LIB_NAME_AND_CLASS_NAME.match(postfix)
   if is_lib_and_class:
     lib_name = 'dart-' + is_lib_and_class.group(1)
     class_name = is_lib_and_class.group(2)
     return '/%s/%s/%s-class.html' % (channel, lib_name, class_name)
 
-  self.error(404)
+  abort(404)
 
 def redir_bare_lib_name(handler, *args, **kwargs):
   version = kwargs['version']
   libname = kwargs['libname']
 
   # /1.12.0/dart-async => /1.12.0/dart-async/dart-async-library.html
   return '/%s/dart-%s/dart-%s-library.html' % (version, libname, libname)
 
 # /dart_core.html => /stable/dart-core/dart-core-library.html
 def redir_legacy_lib(handler, *args, **kwargs):
@@ skipping 92 matching lines @@
         defaults={'_uri': '/stable'}),
 
     Route('/<version:[\w.-]+>/dart-<libname:\w+>', RedirectHandler,
         defaults={'_uri': redir_bare_lib_name}),
 
     Route('/', RedirectHandler, defaults={'_uri': '/stable'}),
 
     Route('<path:.*>', ApiDocs)
   ],
   debug=True)