Mailman 3 September 2010 - Python-checkins

Python Regression Test Failures refleak (1)
by Neal Norwitz 30 Sep '10

30 Sep '10

More important issues: ---------------------- test_bz2 leaked [-84, 0, 0] references, sum=-84 Less important issues: ---------------------- test_threadsignals leaked [0, 0, -8] references, sum=-8

1 0

r85129 - in tracker/instances/python-dev/lib/rietveld: Makefile roundup_helper roundup_helper/__init__.py roundup_helper/middleware.py roundup_helper/models.py roundup_helper/urls.py settings.py templates templates/404.html templates/500.html templates/all.html templates/base.html templates/branch_edit.html templates/branch_new.html templates/diff.html templates/diff2.html templates/diff_navigation.html templates/draft_message.html templates/edit.html templates/feeds templates/file_navigat
by martin.v.loewis 30 Sep '10

30 Sep '10

Author: martin.v.loewis Date: Thu Sep 30 23:07:30 2010 New Revision: 85129 Log: Integrate with roundup user management; adjust UI. Added: tracker/instances/python-dev/lib/rietveld/roundup_helper/ tracker/instances/python-dev/lib/rietveld/roundup_helper/__init__.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/roundup_helper/middleware.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/roundup_helper/models.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/roundup_helper/urls.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/ tracker/instances/python-dev/lib/rietveld/templates/404.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/500.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/all.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/base.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/branch_edit.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/branch_new.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/diff.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/diff2.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/diff_navigation.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/draft_message.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/edit.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/feeds (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/file_navigation.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/inline_comment.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/issue.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/issue_base.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/issue_heading.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/issue_row.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/issue_star.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/live_revision.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/mails (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/new.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/patch.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/patchset.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/publish.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/repo_new.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/repos.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/repos_base.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/settings.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/starred.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/use_uploadpy.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/user.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/user_popup.html (contents, props changed) tracker/instances/python-dev/lib/rietveld/templates/view_details_select.html (contents, props changed) Modified: tracker/instances/python-dev/lib/rietveld/Makefile tracker/instances/python-dev/lib/rietveld/settings.py Modified: tracker/instances/python-dev/lib/rietveld/Makefile ============================================================================== --- tracker/instances/python-dev/lib/rietveld/Makefile (original) +++ tracker/instances/python-dev/lib/rietveld/Makefile Thu Sep 30 23:07:30 2010 @@ -11,7 +11,7 @@ clean_external: clean_rietveld clean_django clean_rietveld: - rm -rf codereview static templates + rm -rf codereview static templates_svn clean_django: unlink django @@ -21,9 +21,9 @@ rm -f dev.db gae2django: - ln -s ../../gae2django . + ln -s ../../gae2django/gae2django . -dev.db: +syncdb: ./manage.py syncdb codereview: @@ -33,8 +33,8 @@ svn co http://rietveld.googlecode.com/svn/trunk/static@$(RIETVELDREV) patch -p0 < patches/upload.diff -templates: - svn co http://rietveld.googlecode.com/svn/trunk/templates@$(RIETVELDREV) +templates_svn: + svn co http://rietveld.googlecode.com/svn/trunk/templates@$(RIETVELDREV) templates_svn django: - ln -s ../../django . \ No newline at end of file + ln -s ../../gae2django/django . Added: tracker/instances/python-dev/lib/rietveld/roundup_helper/__init__.py ============================================================================== Added: tracker/instances/python-dev/lib/rietveld/roundup_helper/middleware.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/roundup_helper/middleware.py Thu Sep 30 23:07:30 2010 @@ -0,0 +1,48 @@ +from models import Session, User +from django.contrib import auth +from django.contrib.auth.backends import RemoteUserBackend + +class UserBackend(RemoteUserBackend): + def configure_user(self, user): + roundup_user = User.objects.filter(_username=user.username)[0] + user.email = roundup_user._address + user.save() + from codereview import models + account = models.Account.get_account_for_user(user) + account.nickname = user.username + account.save() + return user + +class LookupRoundupUser(object): + + def process_request(self, request): + session_key = request.COOKIES.get('roundup_session_Tracker', None) + if not session_key: + self.logout(request) + return + session = Session.objects.filter(session_key = session_key) + if not session: + self.logout(request) + return + username = eval(session[0].session_value)['user'] + # the username comes from the cookie, so it really ought to exist + roundup_user = User.objects.filter(_username=username)[0] + if not roundup_user._address: + # Rietveld insists that user objects must have email addresses + return + # Taken from RemoteUserMiddleware: auto-create the user if it's new + if request.user.is_authenticated(): + if request.user.username == username: + return + # We are seeing this user for the first time in this session, attempt + # to authenticate the user. + user = auth.authenticate(remote_user=username) + if user: + # User is valid. Set request.user and persist user in the session + # by logging the user in. + request.user = user + auth.login(request, user) + + def logout(self, request): + # Clear django session if roundup session is gone. + auth.logout(request) Added: tracker/instances/python-dev/lib/rietveld/roundup_helper/models.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/roundup_helper/models.py Thu Sep 30 23:07:30 2010 @@ -0,0 +1,15 @@ +# Django mappings for roundup tables +from django.db import models + +class Session(models.Model): + session_key = models.CharField(primary_key=True, max_length=255) + session_value = models.TextField() + class Meta: + db_table = 'sessions' + +class User(models.Model): + _username = models.CharField() + _realname = models.CharField() + _address = models.CharField() + class Meta: + db_table = '_user' Added: tracker/instances/python-dev/lib/rietveld/roundup_helper/urls.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/roundup_helper/urls.py Thu Sep 30 23:07:30 2010 @@ -0,0 +1,7 @@ +from django.conf.urls.defaults import * +from django.contrib import admin + +urlpatterns = patterns('', + ('python-dev/', 'roundup'), + ('review/', include('rietveld_helper.urls')), + ) Modified: tracker/instances/python-dev/lib/rietveld/settings.py ============================================================================== --- tracker/instances/python-dev/lib/rietveld/settings.py (original) +++ tracker/instances/python-dev/lib/rietveld/settings.py Thu Sep 30 23:07:30 2010 @@ -2,7 +2,7 @@ # NOTE: Keep the settings.py in examples directories in sync with this one! -import os +import os, ConfigParser DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -13,19 +13,22 @@ MANAGERS = ADMINS -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = 'dev.db' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. +_c = ConfigParser.ConfigParser({'password':'', 'port':''}) +_c.read(os.path.dirname(__file__)+"/../../config.ini") + +DATABASE_ENGINE = 'postgresql_psycopg2' +DATABASE_NAME = _c.get('rdbms', 'name') +DATABASE_USER = _c.get('rdbms', 'user') +DATABASE_PASSWORD = _c.get('rdbms', 'password') +DATABASE_HOST = _c.get('rdbms', 'host') +DATABASE_PORT = _c.get('rdbms', 'port') # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = 'America/Chicago' +TIME_ZONE = 'Europe/Amsterdam' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html @@ -44,7 +47,7 @@ # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '/static/' +MEDIA_URL = '/review/static/' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. @@ -52,7 +55,7 @@ ADMIN_MEDIA_PREFIX = '/media/' # Make this unique, and don't share it with anybody. -SECRET_KEY = 'el@4s$*(idwm5-87teftxlksckmy8$tyo7(tm!n-5x)zeuheex' +SECRET_KEY = _c.get('django', 'secret_key') # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( @@ -61,10 +64,12 @@ # 'django.template.loaders.eggs.load_template_source', ) +AUTHENTICATION_BACKENDS = ('roundup_helper.middleware.UserBackend',) MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'roundup_helper.middleware.LookupRoundupUser', 'gae2django.middleware.FixRequestUserMiddleware', 'rietveld_helper.middleware.AddUserToRequestMiddleware', 'django.middleware.doc.XViewMiddleware', @@ -74,7 +79,7 @@ 'django.core.context_processors.request', ) -ROOT_URLCONF = 'rietveld_helper.urls' +ROOT_URLCONF = 'roundup_helper.urls' TEMPLATE_DIRS = ( os.path.join(os.path.dirname(__file__), 'templates'), Added: tracker/instances/python-dev/lib/rietveld/templates/404.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/404.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/404.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/500.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/500.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/500.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/all.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/all.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/all.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/base.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/base.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1,250 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title> + {%if is_dev%} + (DEV) + {%endif%} + {%block title1%} + {%if patch%}{{patch.filename}} -{%endif%} + {%endblock%} + {%block title2%} + {%if issue%}Issue {{issue.key.id}}: {{issue.subject}} -{%endif%} + {%endblock%} + Code Review + </title> + <link rel="icon" href="{{media_url}}favicon.ico" /> + <link type="text/css" rel="stylesheet" href="{{media_url}}styles.css" /> + <script type="text/javascript" src="{{media_url}}script.js"></script> + <link rel="alternate" type="application/atom+xml" + title="Recent Issues" + href="{%url django.contrib.syndication.views.feed url="all"%}" /> + {%if user%} + <link rel="alternate" type="application/atom+xml" + title="Issues created by me" + href="{%url django.contrib.syndication.views.feed url="mine"%}/{%nickname user True%}" /> + <link rel="alternate" type="application/atom+xml" + title="Issues reviewable by me" + href="{%url django.contrib.syndication.views.feed url="reviews"%}/{%nickname user True%}" /> + <link rel="alternate" type="application/atom+xml" + title="Issues closed by me" + href="{%url django.contrib.syndication.views.feed url="closed"%}/{%nickname user True%}" /> + {%endif%} + {%if issue%} + <link rel="alternate" type="application/atom+xml" + title="Issue {{issue.key.id}}" + href="{%url django.contrib.syndication.views.feed url="issue"%}/{{issue.key.id}}" /> + {%endif%} +</head> +<body onunload="M_unloadPage();"> + + +<script type="text/javascript"> +</script> +<div id="help" style="display: none;"> +{%block help%}{%endblock%} +<div style="font-size: medium; text-align: center;">Keyboard Shortcuts</div> +<hr /> +<table width="100%"> + + <tr valign="top"> + <td> + <table width="100%"> + <tr> + <td></td><th>File</th> + </tr> + <tr> + <td class="shortcut"><span class="letter">u</span> <b>:</b></td><td>up to issue</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">m</span> <b>:</b></td><td>publish + mail comments</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">M</span> <b>:</b></td><td>edit review message</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">j</span> / <span class="letter">k</span> <b>:</b></td><td>jump to file after / before current file</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">J</span> / <span class="letter">K</span> <b>:</b></td><td>jump to next file with a comment after / before current file</td> + </tr> + <tr> + <td></td><th>Side-by-side diff</th> + </tr> + <tr> + <td class="shortcut"><span class="letter">i</span> <b>:</b></td><td>toggle intra-line diffs</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">e</span> <b>:</b></td><td>expand all comments</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">c</span> <b>:</b></td><td>collapse all comments</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">s</span> <b>:</b></td><td>toggle showing all comments</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">n</span> / <span class="letter">p</span> <b>:</b></td><td>next / previous diff chunk or comment</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">N</span> / <span class="letter">P</span> <b>:</b></td><td>next / previous comment</td> + </tr> + <tr> + <td class="shortcut"><span class="letter"><Enter></span> <b>:</b></td><td>respond to / edit current comment</td> + </tr> + </table> + </td> + <td> + <table width="100%"> + <tr> + <td></td><th>Issue</th> + </tr> + <tr> + <td class="shortcut"><span class="letter">u</span> <b>:</b></td><td>up to list of issues</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">m</span> <b>:</b></td><td>publish + mail comments</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">j</span> / <span class="letter">k</span> <b>:</b></td><td>jump to patch after / before current patch</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">o</span> / <span class="letter"><Enter></span> <b>:</b></td><td>open current patch in side-by-side view</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">i</span> <b>:</b></td><td>open current patch in unified diff view</td> + </tr> + <tr><td> </td></tr> + <tr><td></td><th>Issue List</th></tr> + <tr> + <td class="shortcut"><span class="letter">j</span> / <span class="letter">k</span> <b>:</b></td><td>jump to issue after / before current issue</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">o</span> / <span class="letter"><Enter></span> <b>:</b></td><td>open current issue</td> + </tr> + <tr> + <td class="shortcut"><span class="letter">#</span> <b>:</b></td> + <td>close issue</td> + </tr> + <tr><td> </td></tr> + <tr> + <td></td><th>Comment/message editing</th> + </tr> + <tr> + <td class="shortcut"><span class="letter"><Ctrl></span> + <span class="letter">s</span> <b>:</b></td><td>save comment</td> + </tr> + <tr> + <td class="shortcut"><span class="letter"><Esc></span> <b>:</b></td><td>cancel edit</td> + </tr> + </table> + </td> + </tr> + +</table> +</div> + + +<div align="right"> +{%if is_dev%} +<div style="float:left; color:green; font-weight:bold">DEVELOPMENT SERVER</div> +{%else%} +<div style="float:left; font-weight:bold"><i>Rietveld</i> Code Review Tool</div> +{%endif%} +{%if user%} +<b>{{user.email}} ({%nickname user True%})</b> +| +{%if must_choose_nickname%} +<span style="color:red">Please choose your nickname with</span>{%endif%} +<a class="novisit" href="{%url codereview.views.settings%}">Settings</a> +| +{%endif%} +{%if is_dev%} +<a class="novisit" target="_blank" href="/_ah/admin">Admin</a> +| +{%endif%} +<a class="novisit" target="_blank" + href="http://code.google.com/p/rietveld/wiki/CodeReviewHelp">Help</a> +| +<a class="novisit" target="_blank" + href="http://code.google.com/p/rietveld/issues/list">Bug tracker</a> +| +<a class="novisit" target="_blank" + href="http://groups.google.com/group/codereview-discuss">Discussion group</a> +| +<a class="novisit" target="_blank" + href="http://code.google.com/p/rietveld">Source code</a> +| +{%if user%} +<a class="novisit" href="{%url roundup%}?@action=logout">Sign out</a> +{% else %} +<a class="novisit" href="{%url roundup%}">Sign in</a> +{%endif%} +</div> + +<div class="counter">({{counter}})</div> +<div class="mainmenu"> + {%block mainmenu%} + <a href="{%url codereview.views.index %}">Issues</a> + <a href="{%url codereview.views.repos %}">Repositories</a> + {%endblock%} +</div> +<div class="mainmenu2"> + {%block mainmenu2%}{%endblock%} +</div> + +<div> +{%block body%}BODY GOES HERE{%endblock%} +</div> +{%block popup%}{%endblock%} + +<p /> +<div id="footer" style="float:left; font-size:75%"> +<a href="http://www.python.org/about/website">Website maintained by the Python community</a><br /> + +<a href="http://www.upfrontsystems.co.za/" title="issue tracker hosting provided by Upfront Systems, South Africa">hosting by Upfront Systems</a> <br/> +Copyright © 1990-2010, <a href="http://python.org/psf">Python Software Foundation</a><br /> +<a href="http://python.org/about/legal">Legal Statements</a> +</div> + +<div class="extra" style="font-size: 9pt; float: right; text-align: right;"> + <div style="height:14px;"> + <img src="{{media_url}}rss.gif" alt="RSS Feeds" width="14" height="14" + align="top" /> + <a href="{%url django.contrib.syndication.views.feed url="all"%}">Recent Issues</a> + {%if user%} + | + <a href="{%url django.contrib.syndication.views.feed url="mine"%}/{%nickname user True%}">My Issues</a> + | + <a href="{%url django.contrib.syndication.views.feed url="reviews"%}/{%nickname user True%}">My Reviews</a> + | + <a href="{%url django.contrib.syndication.views.feed url="closed"%}/{%nickname user True%}">My Closed</a> + {%endif%} + {%if issue%} + | + <a href="{%url django.contrib.syndication.views.feed url="issue"%}/{{issue.key.id}}">This issue</a> + {%endif%} + </div> + <div style="margin-top: .3em;">{%include "live_revision.html"%}</div> +</div> + +<script type="text/javascript"> +var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); +document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +</script> +<script type="text/javascript"> +var pageTracker = _gat._getTracker("UA-4803694-4"); +pageTracker._initData(); +pageTracker._trackPageview(); +</script> +</body> +</html> Added: tracker/instances/python-dev/lib/rietveld/templates/branch_edit.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/branch_edit.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/branch_edit.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/branch_new.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/branch_new.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/branch_new.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/diff.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/diff.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/diff.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/diff2.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/diff2.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/diff2.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/diff_navigation.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/diff_navigation.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/diff_navigation.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/draft_message.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/draft_message.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/draft_message.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/edit.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/edit.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/edit.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/feeds ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/feeds Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/feeds \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/file_navigation.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/file_navigation.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/file_navigation.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/inline_comment.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/inline_comment.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/inline_comment.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/issue.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/issue.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/issue.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/issue_base.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/issue_base.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1,127 @@ +{%extends "base.html"%} + +{%block mainmenu%} + <a href="{%url codereview.views.index%}" class="active">Issues</a> + <a href="{%url codereview.views.repos%}">Repositories</a> +{%endblock%} + + +{%block mainmenu2%} + {%if user%} + {%if uploadpy_hint%} + <a href="{%url codereview.views.use_uploadpy%}">Create Issue</a> + {%else%} + <a href="{%url codereview.views.new%}">Create Issue</a> + {%endif%} + | + <a href="{%url codereview.views.mine%}">My Issues</a> + | + <a href="{%url codereview.views.all%}">Recent Issues</a> + | + <a href="{%url codereview.views.starred%}">Starred Issues</a> + {%else%} + <a class="novisit" href="{%url codereview.views.index%}">Recent Issues</a> + | + <a class="novisit" href="{%url roundup%}">Sign in</a> + with your traccer account to create issues and add comments + {%endif%} +{%endblock%} + + +{%block body%} + <h2> + {%include "issue_star.html"%} +{%if issue.edit_allowed and not issue.closed%} +<span class="issue-close" id="issue-close-{{issue.key.id}}"> + <a href="javascript:M_closeIssue({{issue.key.id}})"> + <img src="{{media_url}}close.gif" title="Close This Issue" width="15" + height="15" border="0"></a> +</span> +{%endif%} + Issue <a href="{%url codereview.views.show issue.key.id%}" + onmouseover="M_showPopUp(this, 'popup-issue');"> + {{issue.key.id}}</a>: + {{issue.subject}} {%if issue.closed %} (Closed) {%endif%} + </h2> + + <table class="issue-details" border="0" width="100%"> + <tr valign="top"> + + <td class="meta" width="20%"> + {%block issue_actions%} + <div> + {%if issue.edit_allowed%} + <a class="novisit" + href="{%url codereview.views.edit issue.key.id%}"> + Edit Issue + </a> + {%else%} + <span class="disabled">Can't Edit</span> + {%endif%} + <br/> + {%if user%} + <a class="novisit" + href="{%url codereview.views.publish issue.key.id%}"> + Publish+Mail Comments + </a> ('m') + {%else%} + <span class="disabled">Can't Publish+Mail</span> + {%endif%} + {%if last_patchset and first_patch%} + <br/> + <a class="novisit" + href="{%url codereview.views.diff issue.key.id,last_patchset.key.id,first_patch.key.id%}"> + <b>Start Review</b> + </a> + {%endif%} + </div> + {%endblock%} + <div class="issue_details_sidebar"> + <div><b>Created:</b><br/> + {{issue.created|timesince}} ago by {{issue.owner|show_user}} + </div> + <div><b>Modified:</b><br/> + {{issue.modified|timesince}} ago + </div> + <div><b>Reviewers:</b><br/> + {{issue.reviewers|show_users}} + </div> + <div><b>CC:</b><br/> + {%nicknames issue.cc%} + </div> + <div><b>SVN Base:</b><br/> + {%firstof issue.base%} + </div> + <div><b>Visibility:</b><br/> + {%if issue.private%} + Private. Only viewable by reviewers and CCs. + {% else %} + Public. + {%endif%} + </div> + </div> + </td> + + <td style="padding-left: .8em; padding-right: .8em;" width="80%"> + {%block issue_body%}BODY GOES HERE{%endblock%} + </td> + </tr> + </table> +{%endblock%} + + +{%block popup%} + {%if issue%} + <div class="popup" id="popup-issue"> + <b>Issue {{issue.key.id}}: {{issue.subject}} + {%if issue.closed %} (Closed) {%endif%}</b><br/> + Created {{issue.created|timesince}} ago by {%nickname issue.owner%}<br/> + Modified {{issue.modified|timesince}} ago<br/> + Reviewers: {%nicknames issue.reviewers%}<br/> + SVN Base: {{issue.base}}<br/> + Comments: {{issue.num_comments}} + {%if issue.num_drafts%} <span style="color: red;">+ + {{issue.num_drafts}} drafts</span>{%endif%} + </div> + {%endif%} +{%endblock%} Added: tracker/instances/python-dev/lib/rietveld/templates/issue_heading.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/issue_heading.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/issue_heading.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/issue_row.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/issue_row.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/issue_row.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/issue_star.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/issue_star.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/issue_star.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/live_revision.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/live_revision.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/live_revision.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/mails ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/mails Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/mails \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/new.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/new.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/new.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/patch.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/patch.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/patch.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/patchset.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/patchset.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/patchset.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/publish.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/publish.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/publish.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/repo_new.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/repo_new.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/repo_new.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/repos.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/repos.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/repos.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/repos_base.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/repos_base.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1,15 @@ +{%extends "base.html"%} +{%block mainmenu%} +<a href="{%url codereview.views.index%}">Issues</a> +<a href="{%url codereview.views.repos%}" class="active">Repositories</a> +{%endblock%} + +{%block mainmenu2%} + <a href="{%url codereview.views.repos%}">Repositories and Branches</a> + {%if is_admin%} + | + <a href="{%url codereview.views.repo_init%}">Initialize Repositories</a> + {%endif%} +{%endblock%} + +{%block body%}BODY GOES HERE{%endblock%} \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/settings.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/settings.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/settings.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/starred.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/starred.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/starred.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/use_uploadpy.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/use_uploadpy.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/use_uploadpy.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/user.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/user.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/user.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/user_popup.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/user_popup.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/user_popup.html \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/templates/view_details_select.html ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/templates/view_details_select.html Thu Sep 30 23:07:30 2010 @@ -0,0 +1 @@ +link ../templates_svn/view_details_select.html \ No newline at end of file

1 0

r85128 - in tracker/instances/python-dev: lib/rietveld lib/rietveld/Makefile lib/rietveld/README lib/rietveld/__init__.py lib/rietveld/manage.py lib/rietveld/patches lib/rietveld/rietveld_helper lib/rietveld/settings.py
by martin.v.loewis 30 Sep '10

30 Sep '10

Author: martin.v.loewis Date: Thu Sep 30 16:34:03 2010 New Revision: 85128 Log: Import rietveld. Added: tracker/instances/python-dev/lib/rietveld/ tracker/instances/python-dev/lib/rietveld/Makefile (contents, props changed) tracker/instances/python-dev/lib/rietveld/README (contents, props changed) tracker/instances/python-dev/lib/rietveld/__init__.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/manage.py (contents, props changed) tracker/instances/python-dev/lib/rietveld/patches (contents, props changed) tracker/instances/python-dev/lib/rietveld/rietveld_helper (contents, props changed) tracker/instances/python-dev/lib/rietveld/settings.py (contents, props changed) Modified: tracker/instances/python-dev/ (props changed) Added: tracker/instances/python-dev/lib/rietveld/Makefile ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/Makefile Thu Sep 30 16:34:03 2010 @@ -0,0 +1,40 @@ +RIETVELDREV=510 + +default: + @echo "Run 'make all' to fetch required sources to run this example." + +all: static templates codereview django gae2django dev.db + @echo "Run './manage.py runserver 127.0.0.1:8000' to run Rietveld." + +clean: clean_local clean_external + +clean_external: clean_rietveld clean_django + +clean_rietveld: + rm -rf codereview static templates + +clean_django: + unlink django + +clean_local: + unlink gae2django + rm -f dev.db + +gae2django: + ln -s ../../gae2django . + +dev.db: + ./manage.py syncdb + +codereview: + svn co http://rietveld.googlecode.com/svn/trunk/codereview@$(RIETVELDREV) + +static: + svn co http://rietveld.googlecode.com/svn/trunk/static@$(RIETVELDREV) + patch -p0 < patches/upload.diff + +templates: + svn co http://rietveld.googlecode.com/svn/trunk/templates@$(RIETVELDREV) + +django: + ln -s ../../django . \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/README ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/README Thu Sep 30 16:34:03 2010 @@ -0,0 +1 @@ +This is a copy (with modifications) from gae2django/examples/rietveld. Added: tracker/instances/python-dev/lib/rietveld/__init__.py ============================================================================== Added: tracker/instances/python-dev/lib/rietveld/manage.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/manage.py Thu Sep 30 16:34:03 2010 @@ -0,0 +1,16 @@ +#!/usr/bin/env python +import gae2django +# Use gae2django.install(server_software='Dev') to enable a link to the +# admin frontend at the top of each page. By default this link is hidden. +gae2django.install(server_software='Django') + +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings) Added: tracker/instances/python-dev/lib/rietveld/patches ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/patches Thu Sep 30 16:34:03 2010 @@ -0,0 +1 @@ +link ../../gae2django/examples/rietveld/patches \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/rietveld_helper ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/rietveld_helper Thu Sep 30 16:34:03 2010 @@ -0,0 +1 @@ +link ../../gae2django/examples/rietveld/rietveld_helper \ No newline at end of file Added: tracker/instances/python-dev/lib/rietveld/settings.py ============================================================================== --- (empty file) +++ tracker/instances/python-dev/lib/rietveld/settings.py Thu Sep 30 16:34:03 2010 @@ -0,0 +1,98 @@ +# Django settings for django_gae2django project. + +# NOTE: Keep the settings.py in examples directories in sync with this one! + +import os + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email(a)domain.com'), +) + +MANAGERS = ADMINS + +DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_NAME = 'dev.db' # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'America/Chicago' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash if there is a path component (optional in other cases). +# Examples: "http://media.lawrence.com", "http://example.com/media/" +MEDIA_URL = '/static/' + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +ADMIN_MEDIA_PREFIX = '/media/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = 'el@4s$*(idwm5-87teftxlksckmy8$tyo7(tm!n-5x)zeuheex' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.load_template_source', + 'django.template.loaders.app_directories.load_template_source', +# 'django.template.loaders.eggs.load_template_source', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'gae2django.middleware.FixRequestUserMiddleware', + 'rietveld_helper.middleware.AddUserToRequestMiddleware', + 'django.middleware.doc.XViewMiddleware', +) + +TEMPLATE_CONTEXT_PROCESSORS = ( + 'django.core.context_processors.request', +) + +ROOT_URLCONF = 'rietveld_helper.urls' + +TEMPLATE_DIRS = ( + os.path.join(os.path.dirname(__file__), 'templates'), +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'gae2django', + 'rietveld_helper', + 'codereview', +) + +AUTH_PROFILE_MODULE = 'codereview.Account' +LOGIN_REDIRECT_URL = '/' + +# This won't work with gae2django. +RIETVELD_INCOMING_MAIL_ADDRESS = None

1 0

r85127 - python/branches/release27-maint/Lib/test/test_httpservers.py
by senthil.kumaran 30 Sep '10

30 Sep '10

Author: senthil.kumaran Date: Thu Sep 30 08:40:56 2010 New Revision: 85127 Log: Added BaseHTTPRequestHandler related tests. Modified: python/branches/release27-maint/Lib/test/test_httpservers.py Modified: python/branches/release27-maint/Lib/test/test_httpservers.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_httpservers.py (original) +++ python/branches/release27-maint/Lib/test/test_httpservers.py Thu Sep 30 08:40:56 2010 @@ -11,6 +11,7 @@ import os import sys +import re import base64 import shutil import urllib @@ -18,6 +19,9 @@ import tempfile import unittest + +from StringIO import StringIO + from test import test_support threading = test_support.import_module('threading') @@ -27,6 +31,22 @@ # don't write log messages to stderr pass +class SocketlessRequestHandler(BaseHTTPRequestHandler): + def __init__(self): + self.get_called = False + self.protocol_version = "HTTP/1.1" + + def do_GET(self): + self.get_called = True + self.send_response(200) + self.send_header('Content-Type', 'text/html') + self.end_headers() + self.wfile.write('<html><body>Data</body></html>\r\n') + + def log_message(self, format, *args): + pass + + class TestServerThread(threading.Thread): def __init__(self, test_object, request_handler): @@ -67,6 +87,63 @@ self.connection.request(method, uri, body, headers) return self.connection.getresponse() +class BaseHTTPRequestHandlerTestCase(unittest.TestCase): + """Test the functionaility of the BaseHTTPServer focussing on + BaseHTTPRequestHandler. + """ + + HTTPResponseMatch = re.compile('HTTP/1.[0-9]+ 200 OK') + + def setUp (self): + self.handler = SocketlessRequestHandler() + + def send_typical_request(self, message): + input = StringIO(message) + output = StringIO() + self.handler.rfile = input + self.handler.wfile = output + self.handler.handle_one_request() + output.seek(0) + return output.readlines() + + def verify_get_called(self): + self.assertTrue(self.handler.get_called) + + def verify_expected_headers(self, headers): + for fieldName in 'Server: ', 'Date: ', 'Content-Type: ': + self.assertEqual(sum(h.startswith(fieldName) for h in headers), 1) + + def verify_http_server_response(self, response): + match = self.HTTPResponseMatch.search(response) + self.assertTrue(match is not None) + + def test_http_1_1(self): + result = self.send_typical_request('GET / HTTP/1.1\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], '<html><body>Data</body></html>\r\n') + + def test_http_1_0(self): + result = self.send_typical_request('GET / HTTP/1.0\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], '<html><body>Data</body></html>\r\n') + + def test_http_0_9(self): + result = self.send_typical_request('GET / HTTP/0.9\r\n\r\n') + self.assertEqual(len(result), 1) + self.assertEqual(result[0], '<html><body>Data</body></html>\r\n') + self.verify_get_called() + + def test_with_continue_1_0(self): + result = self.send_typical_request('GET / HTTP/1.0\r\nExpect: 100-continue\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], '<html><body>Data</body></html>\r\n') + class BaseHTTPServerTestCase(BaseTestCase): class request_handler(NoLogRequestHandler, BaseHTTPRequestHandler): @@ -402,10 +479,11 @@ def test_main(verbose=None): try: cwd = os.getcwd() - test_support.run_unittest(BaseHTTPServerTestCase, - SimpleHTTPServerTestCase, - CGIHTTPServerTestCase - ) + test_support.run_unittest(BaseHTTPRequestHandlerTestCase, + BaseHTTPServerTestCase, + SimpleHTTPServerTestCase, + CGIHTTPServerTestCase + ) finally: os.chdir(cwd)

1 0

r85126 - python/branches/release31-maint/Lib/test/test_httpservers.py
by senthil.kumaran 30 Sep '10

30 Sep '10

Author: senthil.kumaran Date: Thu Sep 30 08:34:02 2010 New Revision: 85126 Log: Add BaseHTTPRequestHandler related tests. Modified: python/branches/release31-maint/Lib/test/test_httpservers.py Modified: python/branches/release31-maint/Lib/test/test_httpservers.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_httpservers.py (original) +++ python/branches/release31-maint/Lib/test/test_httpservers.py Thu Sep 30 08:34:02 2010 @@ -10,6 +10,7 @@ import os import sys +import re import base64 import shutil import urllib.parse @@ -18,6 +19,8 @@ import threading import unittest + +from io import BytesIO from test import support class NoLogRequestHandler: @@ -29,6 +32,22 @@ return '' +class SocketlessRequestHandler(BaseHTTPRequestHandler): + def __init__(self): + self.get_called = False + self.protocol_version = "HTTP/1.1" + + def do_GET(self): + self.get_called = True + self.send_response(200) + self.send_header('Content-Type', 'text/html') + self.end_headers() + self.wfile.write(b'<html><body>Data</body></html>\r\n') + + def log_message(self, format, *args): + pass + + class TestServerThread(threading.Thread): def __init__(self, test_object, request_handler): threading.Thread.__init__(self) @@ -64,6 +83,61 @@ self.connection.request(method, uri, body, headers) return self.connection.getresponse() +class BaseHTTPRequestHandlerTestCase(unittest.TestCase): + """Test the functionaility of the BaseHTTPServer.""" + + HTTPResponseMatch = re.compile(b'HTTP/1.[0-9]+ 200 OK') + + def setUp (self): + self.handler = SocketlessRequestHandler() + + def send_typical_request(self, message): + input = BytesIO(message) + output = BytesIO() + self.handler.rfile = input + self.handler.wfile = output + self.handler.handle_one_request() + output.seek(0) + return output.readlines() + + def verify_get_called(self): + self.assertTrue(self.handler.get_called) + + def verify_expected_headers(self, headers): + for fieldName in b'Server: ', b'Date: ', b'Content-Type: ': + self.assertEqual(sum(h.startswith(fieldName) for h in headers), 1) + + def verify_http_server_response(self, response): + match = self.HTTPResponseMatch.search(response) + self.assertTrue(match is not None) + + def test_http_1_1(self): + result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_http_1_0(self): + result = self.send_typical_request(b'GET / HTTP/1.0\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_http_0_9(self): + result = self.send_typical_request(b'GET / HTTP/0.9\r\n\r\n') + self.assertEqual(len(result), 1) + self.assertEqual(result[0], b'<html><body>Data</body></html>\r\n') + self.verify_get_called() + + def test_with_continue_1_0(self): + result = self.send_typical_request(b'GET / HTTP/1.0\r\nExpect: 100-continue\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + class BaseHTTPServerTestCase(BaseTestCase): class request_handler(NoLogRequestHandler, BaseHTTPRequestHandler): @@ -400,7 +474,8 @@ def test_main(verbose=None): try: cwd = os.getcwd() - support.run_unittest(BaseHTTPServerTestCase, + support.run_unittest(BaseHTTPRequestHandlerTestCase, + BaseHTTPServerTestCase, SimpleHTTPServerTestCase, CGIHTTPServerTestCase )

1 0

r85125 - in python/branches/py3k: Doc/library/http.server.rst Lib/http/server.py Lib/test/test_httpservers.py Misc/NEWS
by senthil.kumaran 30 Sep '10

30 Sep '10

Author: senthil.kumaran Date: Thu Sep 30 08:09:18 2010 New Revision: 85125 Log: Issue1491 - BaseHTTPServer incorrectly implements response code 100 Modified: python/branches/py3k/Doc/library/http.server.rst python/branches/py3k/Lib/http/server.py python/branches/py3k/Lib/test/test_httpservers.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/http.server.rst ============================================================================== --- python/branches/py3k/Doc/library/http.server.rst (original) +++ python/branches/py3k/Doc/library/http.server.rst Thu Sep 30 08:09:18 2010 @@ -155,6 +155,17 @@ This method will parse and dispatch the request to the appropriate :meth:`do_\*` method. You should never need to override it. + .. method:: handle_expect_100() + + When a HTTP/1.1 compliant server receives a ``Expect: 100-continue`` + request header it responds back with a ``100 Continue`` followed by ``200 + OK`` headers. + This method can be overridden to raise an error if the server does not + want the client to continue. For e.g. server can chose to send ``417 + Expectation Failed`` as a response header and ``return False``. + + .. versionadded:: 3.2 + .. method:: send_error(code, message=None) Sends and logs a complete error reply to the client. The numeric *code* @@ -174,6 +185,15 @@ Writes a specific HTTP header to the output stream. *keyword* should specify the header keyword, with *value* specifying its value. + .. method:: send_response_only(code, message=None) + + Sends the reponse header only, used for the purposes when ``100 + Continue`` response is sent by the server to the client. If the *message* + is not specified, the HTTP message corresponding the response *code* is + sent. + + .. versionadded:: 3.2 + .. method:: end_headers() Sends a blank line, indicating the end of the HTTP headers in the Modified: python/branches/py3k/Lib/http/server.py ============================================================================== --- python/branches/py3k/Lib/http/server.py (original) +++ python/branches/py3k/Lib/http/server.py Thu Sep 30 08:09:18 2010 @@ -322,6 +322,30 @@ elif (conntype.lower() == 'keep-alive' and self.protocol_version >= "HTTP/1.1"): self.close_connection = 0 + # Examine the headers and look for an Expect directive + expect = self.headers.get('Expect', "") + if (expect.lower() == "100-continue" and + self.protocol_version >= "HTTP/1.1" and + self.request_version >= "HTTP/1.1"): + if not self.handle_expect_100(): + return False + return True + + def handle_expect_100(self): + """Decide what to do with an "Expect: 100-continue" header. + + If the client is expecting a 100 Continue response, we must + respond with either a 100 Continue or a final response before + waiting for the request body. The default is to always respond + with a 100 Continue. You can behave differently (for example, + reject unauthorized requests) by overriding this method. + + This method should either return True (possibly after sending + a 100 Continue response) or send an error response and return + False. + + """ + self.send_response_only(100) return True def handle_one_request(self): @@ -400,6 +424,12 @@ """ self.log_request(code) + self.send_response_only(code, message) + self.send_header('Server', self.version_string()) + self.send_header('Date', self.date_time_string()) + + def send_response_only(self, code, message=None): + """Send the response header only.""" if message is None: if code in self.responses: message = self.responses[code][0] @@ -408,9 +438,6 @@ if self.request_version != 'HTTP/0.9': self.wfile.write(("%s %d %s\r\n" % (self.protocol_version, code, message)).encode('ASCII', 'strict')) - # print (self.protocol_version, code, message) - self.send_header('Server', self.version_string()) - self.send_header('Date', self.date_time_string()) def send_header(self, keyword, value): """Send a MIME header.""" Modified: python/branches/py3k/Lib/test/test_httpservers.py ============================================================================== --- python/branches/py3k/Lib/test/test_httpservers.py (original) +++ python/branches/py3k/Lib/test/test_httpservers.py Thu Sep 30 08:09:18 2010 @@ -10,11 +10,13 @@ import os import sys +import re import base64 import shutil import urllib.parse import http.client import tempfile +from io import BytesIO import unittest from test import support @@ -403,8 +405,103 @@ class SocketlessRequestHandler(SimpleHTTPRequestHandler): def __init__(self): + self.get_called = False + self.protocol_version = "HTTP/1.1" + + def do_GET(self): + self.get_called = True + self.send_response(200) + self.send_header('Content-Type', 'text/html') + self.end_headers() + self.wfile.write(b'<html><body>Data</body></html>\r\n') + + def log_message(self, format, *args): pass +class RejectingSocketlessRequestHandler(SocketlessRequestHandler): + def handle_expect_100(self): + self.send_error(417) + return False + +class BaseHTTPRequestHandlerTestCase(unittest.TestCase): + """Test the functionaility of the BaseHTTPServer. + + Test the support for the Expect 100-continue header. + """ + + HTTPResponseMatch = re.compile(b'HTTP/1.[0-9]+ 200 OK') + + def setUp (self): + self.handler = SocketlessRequestHandler() + + def send_typical_request(self, message): + input = BytesIO(message) + output = BytesIO() + self.handler.rfile = input + self.handler.wfile = output + self.handler.handle_one_request() + output.seek(0) + return output.readlines() + + def verify_get_called(self): + self.assertTrue(self.handler.get_called) + + def verify_expected_headers(self, headers): + for fieldName in b'Server: ', b'Date: ', b'Content-Type: ': + self.assertEqual(sum(h.startswith(fieldName) for h in headers), 1) + + def verify_http_server_response(self, response): + match = self.HTTPResponseMatch.search(response) + self.assertTrue(match is not None) + + def test_http_1_1(self): + result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_http_1_0(self): + result = self.send_typical_request(b'GET / HTTP/1.0\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_http_0_9(self): + result = self.send_typical_request(b'GET / HTTP/0.9\r\n\r\n') + self.assertEqual(len(result), 1) + self.assertEqual(result[0], b'<html><body>Data</body></html>\r\n') + self.verify_get_called() + + def test_with_continue_1_0(self): + result = self.send_typical_request(b'GET / HTTP/1.0\r\nExpect: 100-continue\r\n\r\n') + self.verify_http_server_response(result[0]) + self.verify_expected_headers(result[1:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_with_continue_1_1(self): + result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') + self.assertEqual(result[0], b'HTTP/1.1 100 Continue\r\n') + self.assertEqual(result[1], b'HTTP/1.1 200 OK\r\n') + self.verify_expected_headers(result[2:-1]) + self.verify_get_called() + self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') + + def test_with_continue_rejected(self): + usual_handler = self.handler # Save to avoid breaking any subsequent tests. + self.handler = RejectingSocketlessRequestHandler() + result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') + self.assertEqual(result[0], b'HTTP/1.1 417 Expectation Failed\r\n') + self.verify_expected_headers(result[1:-1]) + # The expect handler should short circuit the usual get method by + # returning false here, so get_called should be false + self.assertFalse(self.handler.get_called) + self.assertEqual(sum(r == b'Connection: close\r\n' for r in result[1:-1]), 1) + self.handler = usual_handler # Restore to avoid breaking any subsequent tests. + + class SimpleHTTPRequestHandlerTestCase(unittest.TestCase): """ Test url parsing """ def setUp(self): @@ -431,6 +528,7 @@ cwd = os.getcwd() try: support.run_unittest( + BaseHTTPRequestHandlerTestCase, BaseHTTPServerTestCase, SimpleHTTPServerTestCase, CGIHTTPServerTestCase, Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Thu Sep 30 08:09:18 2010 @@ -76,6 +76,9 @@ Library ------- +- Issue #1491: BaseHTTPServer nows send a 100 Continue response before sending + a 200 OK for the Expect: 100-continue request header. + - Issue #9360: Cleanup and improvements to the nntplib module. The API now conforms to the philosophy of bytes and unicode separation in Python 3. A test suite has also been added.

1 0

r85124 - python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py
by hirokazu.yamamoto 29 Sep '10

29 Sep '10

Author: hirokazu.yamamoto Date: Thu Sep 30 05:27:17 2010 New Revision: 85124 Log: Probably cause is not in python. In tcl/tk code. Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py ============================================================================== --- python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py (original) +++ python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Thu Sep 30 05:27:17 2010 @@ -13,7 +13,7 @@ requires('gui') CODES_SIZE = 100 -WAIT = 1 * 60 # XXX: adjust here +trace_enabled = False def debug(s): print >>sys.stdout, s @@ -115,10 +115,14 @@ def test_horizontal_range(self): + global trace_enabled + lscale = ttk.LabeledScale(from_=0, to=10) lscale.pack() debug("===> enter lscale.wait_visibility....") + trace_enabled = True lscale.wait_visibility() + trace_enabled = False debug("===> leave lscale.wait_visibility....") lscale.update() @@ -285,31 +289,9 @@ tests_gui = (LabeledScaleTest,) if __name__ == "__main__": - codes = collections.deque([None] * CODES_SIZE) - code_count = 0 def tracefunc(frame, event, arg): - global code_count - code_count += 1 - codes.append(frame.f_code) - codes.popleft() + if trace_enabled: + debug(frame.f_code) sys.settrace(tracefunc) # only main thread now - def threadfunc(): - while 1: - old_code_count = code_count - debug("----> thread sleeping now...") - time.sleep(WAIT) - debug("----> thread awakened ....") - if old_code_count == code_count: - break - debug("===================") - for code in codes: - if code is None: - continue - debug(code) - t = threading.Thread(target=threadfunc) - t.start() - try: - run_unittest(*tests_gui) - finally: - t.join() + run_unittest(*tests_gui)

1 0

r85123 - python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py
by hirokazu.yamamoto 29 Sep '10

29 Sep '10

Author: hirokazu.yamamoto Date: Thu Sep 30 05:06:08 2010 New Revision: 85123 Log: Probably this is last trial on unittest.... Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py ============================================================================== --- python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py (original) +++ python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Thu Sep 30 05:06:08 2010 @@ -15,6 +15,9 @@ CODES_SIZE = 100 WAIT = 1 * 60 # XXX: adjust here +def debug(s): + print >>sys.stdout, s + sys.stdout.flush() class LabeledScaleTest(unittest.TestCase): @@ -114,13 +117,11 @@ def test_horizontal_range(self): lscale = ttk.LabeledScale(from_=0, to=10) lscale.pack() - print("===> enter lscale.wait_visibility....") + debug("===> enter lscale.wait_visibility....") lscale.wait_visibility() - print("===> leave lscale.wait_visibility....") + debug("===> leave lscale.wait_visibility....") lscale.update() - time.sleep(2 * 60) - linfo_1 = lscale.label.place_info() prev_xcoord = lscale.scale.coords()[0] self.assertEqual(prev_xcoord, int(linfo_1['x'])) @@ -296,16 +297,16 @@ def threadfunc(): while 1: old_code_count = code_count - print("----> thread sleeping now...") + debug("----> thread sleeping now...") time.sleep(WAIT) - print("----> thread awakened ....") + debug("----> thread awakened ....") if old_code_count == code_count: break - print("===================") + debug("===================") for code in codes: if code is None: continue - print(code) + debug(code) t = threading.Thread(target=threadfunc) t.start() try:

1 0

r85122 - python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py
by hirokazu.yamamoto 29 Sep '10

29 Sep '10

Author: hirokazu.yamamoto Date: Thu Sep 30 04:51:26 2010 New Revision: 85122 Log: More debug print ... Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Modified: python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py ============================================================================== --- python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py (original) +++ python/branches/release27-maint-ttk-debug-on-xp5/Lib/lib-tk/test/test_ttk/test_extensions.py Thu Sep 30 04:51:26 2010 @@ -13,7 +13,7 @@ requires('gui') CODES_SIZE = 100 -WAIT = 10 * 60 # XXX: adjust here +WAIT = 1 * 60 # XXX: adjust here class LabeledScaleTest(unittest.TestCase): @@ -114,9 +114,13 @@ def test_horizontal_range(self): lscale = ttk.LabeledScale(from_=0, to=10) lscale.pack() + print("===> enter lscale.wait_visibility....") lscale.wait_visibility() + print("===> leave lscale.wait_visibility....") lscale.update() + time.sleep(2 * 60) + linfo_1 = lscale.label.place_info() prev_xcoord = lscale.scale.coords()[0] self.assertEqual(prev_xcoord, int(linfo_1['x'])) @@ -281,13 +285,23 @@ if __name__ == "__main__": codes = collections.deque([None] * CODES_SIZE) + code_count = 0 def tracefunc(frame, event, arg): + global code_count + code_count += 1 codes.append(frame.f_code) codes.popleft() sys.settrace(tracefunc) # only main thread now def threadfunc(): - time.sleep(WAIT) + while 1: + old_code_count = code_count + print("----> thread sleeping now...") + time.sleep(WAIT) + print("----> thread awakened ....") + if old_code_count == code_count: + break + print("===================") for code in codes: if code is None: continue

1 0

Daily py3k reference leaks (r85121): sum=0
by solipsis＠pitrou.net 29 Sep '10

29 Sep '10

py3k results for svn r85121 (hg cset 5feac0848f8f) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogWKL_tf', '-x']

1 0