~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
        super(FtpTransport, self).__init__(base,
97
97
                                           _from_transport=_from_transport)
98
98
        self._unqualified_scheme = 'ftp'
99
 
        if self._scheme == 'aftp':
 
99
        if self._parsed_url.scheme == 'aftp':
100
100
            self.is_active = True
101
101
        else:
102
102
            self.is_active = False