← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:11:25 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-20051201171125-5e1f0970246c4925
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
63
63
                            compact_date,
64
64
                            file_kind,
65
65
                            isdir,
 
66
                            pathjoin,
66
67
                            pumpfile,
67
68
                            splitpath,
68
69
                            rand_bytes,
237
238
            except NotBranchError:
238
239
                pass
239
240
            if tail:
240
 
                tail = os.path.join(os.path.basename(path), tail)
 
241
                tail = pathjoin(os.path.basename(path), tail)
241
242
            else:
242
243
                tail = os.path.basename(path)
243
244
            path = os.path.dirname(path)
262
263
                               getattr(self, 'basedir', None))
263
264
 
264
265
    def abspath(self, filename):
265
 
        return os.path.join(self.basedir, filename)
 
266
        return pathjoin(self.basedir, filename)
266
267
 
267
268
    def relpath(self, abspath):
268
269
        """Return the local path portion from a given absolute path."""