← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to Lib/ntpath.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/ntpath.py
561
561
                path = _getfullpathname(path)
562
562
            except WindowsError:
563
563
                pass # Bad path - return unchanged.
 
564
        elif isinstance(path, bytes):
 
565
            path = os.getcwdb()
564
566
        else:
565
567
            path = os.getcwd()
566
568
        return normpath(path)