← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2008-04-28 03:52:09 UTC
  • mfrom: (3360.3.3 1.4)
  • mto: This revision was merged to the branch mainline in revision 3385.
  • Revision ID: mbp@sourcefrog.net-20080428035209-2sfjlaeijx20wt1z
Merge back 1.4 and start 1.5 (but not transaction cache reinstatement)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
859
859
        body = self._serialise_search_recipe(recipe)
860
860
        path = self.bzrdir._path_for_remote_call(self._client)
861
861
        for key in keys:
862
 
            assert type(key) is str
 
862
            if type(key) is not str:
 
863
                raise ValueError(
 
864
                    "key %r not a plain string" % (key,))
863
865
        verb = 'Repository.get_parent_map'
864
866
        args = (path,) + tuple(keys)
865
867
        try: