/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 bzrlib/win32utils.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
169
169
    # at least return windows root directory
170
170
    windir = os.environ.get('windir')
171
171
    if windir:
172
 
        return os.path.splitdrive(windir) + '/'
 
172
        return os.path.splitdrive(windir)[0] + '/'
173
173
    # otherwise C:\ is good enough for 98% users
174
174
    return 'C:/'
175
175
 
240
240
    return _ensure_unicode(get_host_name())
241
241
 
242
242
 
243
 
def glob_expand_for_win32(file_list):
 
243
def glob_expand(file_list):
244
244
    """Replacement for glob expansion by the shell.
245
245
 
246
246
    Win32's cmd.exe does not do glob expansion (eg ``*.py``), so we do our own