← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:36:29 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201173629-aecb08238e0976a2
Removing instances of os.sep

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
235
235
    if dir == '':
236
236
        return True
237
237
 
238
 
    if dir[-1] != os.sep:
239
 
        dir += os.sep
 
238
    if dir[-1] != '/':
 
239
        dir += '/'
240
240
 
241
241
    return fname.startswith(dir)
242
242
 
500
500
        # to branch anymore.
501
501
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
502
502
 
503
 
    return os.sep.join(s)
 
503
    return pathjoin(*s)
504
504
 
505
505
 
506
506