← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-23 08:51:52 UTC
  • mfrom: (5131.2.6 support_OO_flag)
  • mto: This revision was merged to the branch mainline in revision 5179.
  • Revision ID: v.ladeuil+lp@free.fr-20100423085152-uoewc1vnkwqhw0pj
Manually assign docstrings to command objects, so that they work with python -OO

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
39
39
from bzrlib.transport import LateReadError
40
40
""")
41
41
 
42
 
from bzrlib.transport import Transport, Server
43
 
 
44
 
 
45
 
_append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY
46
 
_put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY
47
 
 
48
 
 
49
 
class LocalTransport(Transport):
 
42
from bzrlib import transport
 
43
 
 
44
 
 
45
_append_flags = os.O_CREAT | os.O_APPEND | os.O_WRONLY | osutils.O_BINARY | osutils.O_NOINHERIT
 
46
_put_non_atomic_flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | osutils.O_BINARY | osutils.O_NOINHERIT
 
47
 
 
48
 
 
49
class LocalTransport(transport.Transport):
50
50
    """This is the transport agent for local filesystem access."""
51
51
 
52
52
    def __init__(self, base):
160
160
            transport._file_streams[canonical_url].flush()
161
161
        try:
162
162
            path = self._abspath(relpath)
163
 
            return open(path, 'rb')
 
163
            return osutils.open_file(path, 'rb')
164
164
        except (IOError, OSError),e:
165
165
            if e.errno == errno.EISDIR:
166
166
                return LateReadError(relpath)
204
204
        except (IOError, OSError),e:
205
205
            self._translate_error(e, path)
206
206
        try:
207
 
            fp.write(bytes)
 
207
            if bytes:
 
208
                fp.write(bytes)
208
209
            fp.commit()
209
210
        finally:
210
211
            fp.close()
285
286
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
286
287
                             create_parent_dir=False, dir_mode=None):
287
288
        def writer(fd):
288
 
            os.write(fd, bytes)
 
289
            if bytes:
 
290
                os.write(fd, bytes)
289
291
        self._put_non_atomic_helper(relpath, writer, mode=mode,
290
292
                                    create_parent_dir=create_parent_dir,
291
293
                                    dir_mode=dir_mode)
327
329
        # initialise the file
328
330
        self.put_bytes_non_atomic(relpath, "", mode=mode)
329
331
        abspath = self._abspath(relpath)
330
 
        handle = open(abspath, 'wb')
 
332
        handle = osutils.open_file(abspath, 'wb')
331
333
        if mode is not None:
332
334
            self._check_mode_and_size(abspath, handle.fileno(), mode)
333
335
        transport._file_streams[self.abspath(relpath)] = handle
370
372
        file_abspath, fd = self._get_append_file(relpath, mode=mode)
371
373
        try:
372
374
            result = self._check_mode_and_size(file_abspath, fd, mode=mode)
373
 
            os.write(fd, bytes)
 
375
            if bytes:
 
376
                os.write(fd, bytes)
374
377
        finally:
375
378
            os.close(fd)
376
379
        return result
478
481
        path = relpath
479
482
        try:
480
483
            path = self._abspath(relpath)
481
 
            return os.stat(path)
 
484
            return os.lstat(path)
482
485
        except (IOError, OSError),e:
483
486
            self._translate_error(e, path)
484
487
 
512
515
        except (IOError, OSError),e:
513
516
            self._translate_error(e, path)
514
517
 
 
518
    if osutils.host_os_dereferences_symlinks():
 
519
        def readlink(self, relpath):
 
520
            """See Transport.readlink."""
 
521
            return osutils.readlink(self._abspath(relpath))
 
522
 
 
523
    if osutils.hardlinks_good():
 
524
        def hardlink(self, source, link_name):
 
525
            """See Transport.link."""
 
526
            try:
 
527
                os.link(self._abspath(source), self._abspath(link_name))
 
528
            except (IOError, OSError), e:
 
529
                self._translate_error(e, source)
 
530
 
 
531
    if osutils.has_symlinks():
 
532
        def symlink(self, source, link_name):
 
533
            """See Transport.symlink."""
 
534
            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
 
535
            source_rel = urlutils.file_relpath(
 
536
                urlutils.strip_trailing_slash(abs_link_dirpath),
 
537
                urlutils.strip_trailing_slash(self.abspath(source))
 
538
            )
 
539
 
 
540
            try:
 
541
                os.symlink(source_rel, self._abspath(link_name))
 
542
            except (IOError, OSError), e:
 
543
                self._translate_error(e, source_rel)
 
544
 
515
545
    def _can_roundtrip_unix_modebits(self):
516
546
        if sys.platform == 'win32':
517
547
            # anyone else?
551
581
            return EmulatedWin32LocalTransport(abspath)
552
582
 
553
583
 
554
 
class LocalURLServer(Server):
555
 
    """A pretend server for local transports, using file:// urls.
556
 
 
557
 
    Of course no actual server is required to access the local filesystem, so
558
 
    this just exists to tell the test code how to get to it.
559
 
    """
560
 
 
561
 
    def setUp(self):
562
 
        """Setup the server to service requests.
563
 
 
564
 
        :param decorated_transport: ignored by this implementation.
565
 
        """
566
 
 
567
 
    def get_url(self):
568
 
        """See Transport.Server.get_url."""
569
 
        return urlutils.local_path_to_url('')
570
 
 
571
 
 
572
584
def get_test_permutations():
573
585
    """Return the permutations to be used in testing."""
574
 
    return [
575
 
            (LocalTransport, LocalURLServer),
576
 
            ]
 
586
    from bzrlib.tests import test_server
 
587
    return [(LocalTransport, test_server.LocalURLServer),]