← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/gio_transport.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-01 13:43:12 UTC
  • mfrom: (5951 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5952.
  • Revision ID: jelmer@samba.org-20110601134312-nor5sp8eeassrzeo
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/gio_transport.py
176
176
        user = None
177
177
        if (flags & gio.ASK_PASSWORD_NEED_USERNAME and
178
178
                flags & gio.ASK_PASSWORD_NEED_DOMAIN):
179
 
            prompt = scheme.upper() + ' %(host)s DOMAIN\username'
 
179
            prompt = u'%s' % (scheme.upper(),) + u' %(host)s DOMAIN\\username'
180
180
            user_and_domain = auth.get_user(scheme, host,
181
181
                    port=port, ask=True, prompt=prompt)
182
182
            (domain, user) = user_and_domain.split('\\', 1)
191
191
            #a DOMAIN and a username prompt should be the
192
192
            #same so I will missuse the ui_factory get_username
193
193
            #a little bit here.
194
 
            prompt = scheme.upper() + ' %(host)s DOMAIN'
 
194
            prompt = u'%s' % (scheme.upper(),) + u' %(host)s DOMAIN'
195
195
            domain = ui.ui_factory.get_username(prompt=prompt)
196
196
            op.set_domain(domain)
197
197