Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: client/tests/trace_inputs_test.py

Issue 2093593002: luci-py: Making __file__ usage unicode safe. (Closed) Base URL: https://github.com/luci/luci-py.git@master
Patch Set: Small fixes. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tests/trace_inputs_smoke_test.py ('k') | client/tests/url_open_timeout_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/trace_inputs_test.py
diff --git a/client/tests/trace_inputs_test.py b/client/tests/trace_inputs_test.py
index 7b1c8e54c03269b3ca2f30979679458bc383a6cd..5313de3ac59b3b3542c3c27c44cc26ae720cedd7 100755
--- a/client/tests/trace_inputs_test.py
+++ b/client/tests/trace_inputs_test.py
@@ -10,11 +10,12 @@ import os
import sys
import unittest
-BASE_DIR = unicode(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.abspath(
+ __file__.decode(sys.getfilesystemencoding())))
ROOT_DIR = os.path.dirname(BASE_DIR)
sys.path.insert(0, ROOT_DIR)
-FILE_PATH = unicode(os.path.abspath(__file__))
+FILE_PATH = os.path.abspath(__file__.decode(sys.getfilesystemencoding()))
import trace_inputs
@@ -237,7 +238,8 @@ if sys.platform != 'win32':
'|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f5350f829d0) = %d' %
self._GRAND_CHILD_PID),
(self._GRAND_CHILD_PID,
- 'open("%s", O_RDONLY) = 76' % os.path.basename(str(FILE_PATH))),
+ 'open("%s", O_RDONLY) = 76' % os.path.basename(
+ FILE_PATH.encode('utf-8'))),
]
size = os.stat(FILE_PATH).st_size
expected = {
« no previous file with comments | « client/tests/trace_inputs_smoke_test.py ('k') | client/tests/url_open_timeout_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698