← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
472
472
        if not line.endswith('\n'):
473
473
            # end of file encountered reading from server
474
474
            raise errors.ConnectionReset(
475
 
                "please check connectivity and permissions")
 
475
                "Unexpected end of message. Please check connectivity "
 
476
                "and permissions, and report a bug if problems persist.")
476
477
        return line
477
478
 
478
479
    def _read_line(self):
518
519
        # Increment the count in the WeakKeyDictionary
519
520
        value = self.counts[params.medium]
520
521
        value['count'] += 1
521
 
        request_method = request.request_handlers.get(params.method)
 
522
        try:
 
523
            request_method = request.request_handlers.get(params.method)
 
524
        except KeyError:
 
525
            # A method we don't know about doesn't count as a VFS method.
 
526
            return
522
527
        if issubclass(request_method, vfs.VfsRequest):
523
528
            value['vfs_count'] += 1
524
529