← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/branch.py

  • Committer: Matt Nordhoff
  • Date: 2009-05-05 18:01:25 UTC
  • mfrom: (339 trunk)
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090505180125-09yuufnnpzo0jr0m
Merge trunk, fixing conflicts

I should check that the imports I removed aren't being used in the new code, but I didn't.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/branch.py
119
119
            self._static_url_base = self._url_base
120
120
        self._environ = environ
121
121
        if self.served_url is _DEFAULT:
122
 
            self.served_url = self.url([])
 
122
            public_branch = self.branch_url()
 
123
            if public_branch is not None:
 
124
                self.served_url = public_branch
 
125
            else:
 
126
                self.served_url = self.url([])
123
127
        path = request.path_info_pop(environ)
124
128
        if not path:
125
129
            raise httpexceptions.HTTPMovedPermanently(