/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to generate_docs.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
generate_docs.py
14
14
#
15
15
# You should have received a copy of the GNU General Public License
16
16
# along with this program; if not, write to the Free Software
17
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
19
19
"""%(prog)s - generate information from built-in bzr help
20
20
 
32
32
 
33
33
Run "%(prog)s --help" for the option reference.
34
34
"""
35
 
import os
 
35
 
36
36
import sys
37
37
from optparse import OptionParser
38
38
 
39
 
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
40
 
 
41
 
from bzrlib import commands, doc_generate
 
39
import tools.doc_generate
42
40
 
43
41
def main(argv):
44
42
    parser = OptionParser(usage="""%prog [options] OUTPUT_FORMAT
71
69
        parser.print_help()
72
70
        sys.exit(1)
73
71
 
74
 
    commands.install_bzr_command_hooks()
75
 
 
76
72
    infogen_type = args[1]
77
 
    infogen_mod = doc_generate.get_module(infogen_type)
 
73
    infogen_mod = tools.doc_generate.get_module(infogen_type)
78
74
 
79
75
    if options.filename:
80
76
        outfilename = options.filename
87
83
        outfile = open(outfilename,"w")
88
84
 
89
85
    if options.show_filename and (outfilename != "-"):
90
 
        sys.stdout.write(outfilename)
91
 
        sys.stdout.write('\n')
 
86
        print >>sys.stdout, outfilename
92
87
    
93
88
    infogen_mod.infogen(options, outfile)
94
89
 
98
93
    Prints out the examples stored in the docstring. 
99
94
 
100
95
    """
101
 
    sys.stdout.write(__doc__ % {"prog":sys.argv[0]})
102
 
    sys.stdout.write('\n')
 
96
    print >>sys.stdout, __doc__ % {"prog":sys.argv[0]}
103
97
    sys.exit(0)
104
98
 
105
99
if __name__ == '__main__':