← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_utils.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_utils.py
16
16
 
17
17
from cStringIO import StringIO
18
18
import errno
19
 
import md5
20
19
import re
21
 
import sha
22
20
import socket
23
21
import threading
24
22
import time
25
23
import urllib2
26
24
import urlparse
27
25
 
 
26
 
28
27
from bzrlib import (
29
28
    errors,
 
29
    osutils,
30
30
    tests,
31
31
    )
32
32
from bzrlib.smart import medium, protocol
397
397
        A1 = '%s:%s:%s' % (user, realm, password)
398
398
        A2 = '%s:%s' % (command, auth['uri'])
399
399
 
400
 
        H = lambda x: md5.new(x).hexdigest()
 
400
        H = lambda x: osutils.md5(x).hexdigest()
401
401
        KD = lambda secret, data: H("%s:%s" % (secret, data))
402
402
 
403
403
        nonce_count = int(auth['nc'], 16)