← Back to branch summary

~ubuntu-branches/ubuntu/lucid/python2.6/lucid

« back to all changes in this revision

Viewing changes to Lib/macpath.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-03-11 13:30:19 UTC
  • mto: (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: james.westby@ubuntu.com-20100311133019-sblbooa3uqrkoe70
Tags: upstream-2.6.5~rc2
Import upstream version 2.6.5~rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/macpath.py
186
186
def abspath(path):
187
187
    """Return an absolute path."""
188
188
    if not isabs(path):
189
 
        path = join(os.getcwd(), path)
 
189
        if isinstance(path, unicode):
 
190
            cwd = os.getcwdu()
 
191
        else:
 
192
            cwd = os.getcwd()
 
193
        path = join(cwd, path)
190
194
    return normpath(path)
191
195
 
192
196
# realpath is a no-op on systems without islink support