diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitTools/TestResultServer/main.py | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitTools/TestResultServer/main.py')
| -rw-r--r-- | WebKitTools/TestResultServer/main.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebKitTools/TestResultServer/main.py b/WebKitTools/TestResultServer/main.py index 7a0d237..aa6e432 100644 --- a/WebKitTools/TestResultServer/main.py +++ b/WebKitTools/TestResultServer/main.py @@ -3,7 +3,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above @@ -13,7 +13,7 @@ # * Neither the name of Google Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -42,17 +42,15 @@ routes = [ ('/dashboards/update', dashboardhandler.UpdateDashboardFile), ('/dashboards/([^?]+)?', dashboardhandler.GetDashboardFile), ('/testfile/delete', testfilehandler.DeleteFile), - ('/testfile/uploadurl', testfilehandler.GetUploadUrl), ('/testfile/upload', testfilehandler.Upload), ('/testfile/uploadform', testfilehandler.UploadForm), ('/testfile/?', testfilehandler.GetFile), - ('/uploadfail', testfilehandler.UploadStatus), - ('/uploadsuccess', testfilehandler.UploadStatus), ('/*|/menu', menu.Menu), ] application = webapp.WSGIApplication(routes, debug=True) + def main(): run_wsgi_app(application) |