Fixed os.getcwdu code for Python 3 compatibility #326

Merged
merged 6 commits into from Jul 22, 2014

Conversation

Projects
None yet
3 participants
@paulhildebrandt

This is building on changes that @takluyver already made. I changed out
instances of getcwdu with our Python version specific core.getcwd. I
also added some very basic unit tests for those changes.

Vdragon and others added some commits Jul 17, 2014

zh_TW.po: fix typo
Simply 轉備 -> 準備

Signed-off-by: V字龍(Vdragon) <Vdragon.Taiwan@gmail.com>
zh_TW.po: improve translation
Signed-off-by: V字龍(Vdragon) <Vdragon.Taiwan@gmail.com>
zh_TW.po: update PO-Revision-Date
Signed-off-by: V字龍(Vdragon) <Vdragon.Taiwan@gmail.com>
po: update i18n files
$ python setup.py build_pot

Signed-off-by: David Aguilar <davvid@gmail.com>
Paul Hildebrandt
core: Apply Python 3 change to code based around os.getcwdu
This is building on changes that @takluyver already made.  I changed out
instances of getcwdu with our Python version specific core.getcwd.  I
also added some very basic unit tests for those changes.
@paulhildebrandt

This comment has been minimized.

Show comment
Hide comment
@paulhildebrandt

paulhildebrandt Jul 20, 2014

Hm.. for some reason I seem to have pulled in some i18n fixes. Not sure why they are included in my pull request.

Hm.. for some reason I seem to have pulled in some i18n fixes. Not sure why they are included in my pull request.

+from PyQt4 import QtGui
+
+from cola import qtutils
+from test.support import run_unittest

This comment has been minimized.

@davvid

davvid Jul 21, 2014

Member

Did you create a new test.support module? I think you forgot to add it. It's probably worth amending the commit for it. If you rebase onto upstream/master it should make that merge commit go away; it's likely that you started work on it before that PR was merged. Thanks Paul!

@davvid

davvid Jul 21, 2014

Member

Did you create a new test.support module? I think you forgot to add it. It's probably worth amending the commit for it. If you rebase onto upstream/master it should make that merge commit go away; it's likely that you started work on it before that PR was merged. Thanks Paul!

davvid added a commit that referenced this pull request Jul 22, 2014

Merge pull request #326 from paulhildebrandt/master
Fixed os.getcwdu code for Python 3 compatibility

Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid merged commit 572a13e into git-cola:master Jul 22, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment