← Back to branch summary

~ubuntu-branches/ubuntu/lucid/python2.6/lucid

« back to all changes in this revision

Viewing changes to Lib/Cookie.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-03-11 13:30:19 UTC
  • mto: (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: james.westby@ubuntu.com-20100311133019-sblbooa3uqrkoe70
Tags: upstream-2.6.5~rc2
Import upstream version 2.6.5~rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/Cookie.py
624
624
        if type(rawdata) == type(""):
625
625
            self.__ParseString(rawdata)
626
626
        else:
627
 
            self.update(rawdata)
 
627
            # self.update() wouldn't call our custom __setitem__
 
628
            for k, v in rawdata.items():
 
629
                self[k] = v
628
630
        return
629
631
    # end load()
630
632