← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/urls/__init__.py

  • Committer: William Grant
  • Date: 2009-07-04 05:12:49 UTC
  • mto: (1294.4.2 ui-the-third)
  • mto: This revision was merged to the branch mainline in revision 1353.
  • Revision ID: grantw@unimelb.edu.au-20090704051249-t3oapiukdd12xvku
Rename 'names' to 'routenames', so I stop confusing myself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/urls/__init__.py
235
235
            if len(todo) == 0 or type(obj) not in self.fmap:
236
236
                raise NotFound(obj, '+index', ())
237
237
 
238
 
            names = self.fmap[type(obj)]
 
238
            routenames = self.fmap[type(obj)]
239
239
 
240
 
            routebits = names.get(todo[0])
 
240
            routebits = routenames.get(todo[0])
241
241
 
242
242
            if routebits is not None:
243
243
                route, argc = routebits
244
244
                # The first path segment is the route identifier, so we skip
245
245
                # it when identifying arguments.
246
246
                argoffset = 1
247
 
            elif None in names:
 
247
            elif None in routenames:
248
248
                # Attempt traversal directly (with no intermediate segment)
249
249
                # as a last resort.
250
 
                route, argc = names[None]
 
250
                route, argc = routenames[None]
251
251
                argoffset = 0
252
252
            else:
253
253
                raise NotFound(obj, todo[0], todo[1:])