Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Lib/test/test_SimpleHTTPServer.py

    r2 r391  
    2222    def test_queryArguments (self):
    2323        path = self.handler.translate_path ('/filename')
    24         self.assertEquals (path, self.translated)
     24        self.assertEqual (path, self.translated)
    2525        path = self.handler.translate_path ('/filename?foo=bar')
    26         self.assertEquals (path, self.translated)
     26        self.assertEqual (path, self.translated)
    2727        path = self.handler.translate_path ('/filename?a=b&spam=eggs#zot')
    28         self.assertEquals (path, self.translated)
     28        self.assertEqual (path, self.translated)
    2929
    3030    def test_startWithDoubleSlash (self):
    3131        path = self.handler.translate_path ('//filename')
    32         self.assertEquals (path, self.translated)
     32        self.assertEqual (path, self.translated)
    3333        path = self.handler.translate_path ('//filename?foo=bar')
    34         self.assertEquals (path, self.translated)
     34        self.assertEqual (path, self.translated)
    3535
    3636
Note: See TracChangeset for help on using the changeset viewer.