Rev 2227: Merge from bzr.dev. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2227
revision-id: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
parent: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:59:48 +1000
message:
  Merge from bzr.dev.
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.6
    merged: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
    parent: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
    parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 09:02:54 +0100
    message:
      (Andrew Bennetts) Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
        ------------------------------------------------------------
        revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.2.3
        merged: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
        parent: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Mon 2007-04-16 15:24:58 +1000
        message:
          Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
        ------------------------------------------------------------
        revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.2.2
        merged: andrew.bennetts at canonical.com-20070416024404-3wwt2juvu7ai8nvn
        parent: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Mon 2007-04-16 12:44:04 +1000
        message:
          Deal with review comments.
        ------------------------------------------------------------
        revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.2.1
        merged: andrew.bennetts at canonical.com-20070413075917-jlvhfi0s607smiu6
        parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-miscellany-2
        timestamp: Fri 2007-04-13 17:59:17 +1000
        message:
          Add some unicode-related tests from the hpss branch, and a few other nits (also from the hpss branch).
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.5
    merged: pqm at pqm.ubuntu.com-20070416054515-up6lmy0v3elcru80
    parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
    parent: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-16 06:45:15 +0100
    message:
      (robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.4.1.1
    merged: robertc at robertcollins.net-20070416032630-2hsgzasuh7oej82u
    parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
    parent: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2007-04-16 13:26:30 +1000
    message:
      (robertc) Use 'python setup.py' instead of './setup.py' (Matthew Fuller)
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.61.2.1
    merged: fullermd at over-yonder.net-20070320224923-txgp33pfz6727duo
    parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
    committer: Matthew Fuller <fullermd at over-yonder.net>
    branch nick: mk-fix
    timestamp: Tue 2007-03-20 17:49:23 -0500
    message:
      (trivial) Use 'python setup.py' instead of './setup.py'.
=== modified file 'Makefile'
--- a/Makefile	2007-04-11 08:09:06 +0000
+++ b/Makefile	2007-04-16 03:26:30 +0000
@@ -19,7 +19,7 @@
 	pyflakes bzrlib | grep -v ' imported but unused'
 
 clean:
-	./setup.py clean
+	python setup.py clean
 	-find . -name "*.pyc" -o -name "*.pyo" | xargs rm -f
 	rm -rf test????.tmp
 

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2007-04-16 17:49:35 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2007-04-16 17:59:48 +0000
@@ -27,7 +27,6 @@
         bzrdir,
         errors,
         osutils,
-        smart,
         tests,
         urlutils,
         )
@@ -1016,11 +1015,12 @@
 
     def build_handler(self, transport):
         """Returns a handler for the commands in protocol version one."""
-        return smart.SmartServerRequestHandler(transport, request.request_handlers)
+        return request.SmartServerRequestHandler(transport,
+                                                 request.request_handlers)
 
     def test_construct_request_handler(self):
         """Constructing a request handler should be easy and set defaults."""
-        handler = smart.SmartServerRequestHandler(None, None)
+        handler = request.SmartServerRequestHandler(None, None)
         self.assertFalse(handler.finished_reading)
 
     def test_hello(self):