Fix decode issues with subprocess results for python 3

ralphbean · Jun 24, 2013 · f2b886c · f2b886c
1 parent 1a10e30
commit f2b886c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/taskw/warrior.py b/taskw/warrior.py
@@ -14,7 +14,6 @@
 import subprocess
 import json
 import pprint
-import locale
 
 import taskw.utils
 
@@ -366,24 +365,22 @@ def can_use(cls):
             ['task', '--version'],
             stdout=subprocess.PIPE
         ).communicate()[0]
-        encoding = locale.getdefaultlocale()[1]
-        taskwarrior_major_version = int(taskwarrior_version.decode(encoding).split('.')[0])
+        taskwarrior_major_version = int(taskwarrior_version.decode().split('.')[0])
         return taskwarrior_major_version >= 2
 
     def load_tasks(self, **kw):
         # Load tasks using `task export`
         pending_tasks = list()
         completed_tasks = list()
         tasks = dict()
-        encoding = locale.getdefaultlocale()[1]
         pending_tasks = json.loads(subprocess.Popen([
             'task', 'rc:%s' % self.config_filename,
             'rc.json.array=TRUE', 'rc.verbose=nothing', 'status:pending',
-            'export'], stdout=subprocess.PIPE).communicate()[0].decode(encoding))
+            'export'], stdout=subprocess.PIPE).communicate()[0].decode())
         completed_tasks = json.loads(subprocess.Popen([
             'task', 'rc:%s' % self.config_filename,
             'rc.json.array=TRUE', 'rc.verbose=nothing', 'status:completed',
-            'export'], stdout=subprocess.PIPE).communicate()[0].decode(encoding))
+            'export'], stdout=subprocess.PIPE).communicate()[0].decode())
         tasks['pending'] = pending_tasks
         tasks['completed'] = completed_tasks
         return tasks
@@ -416,11 +413,10 @@ def _load_task(self, **kw):
                 search = kw[key][4:]
             else:
                 search = six.text_type(kw[key])
-        encoding = locale.getdefaultlocale()[1]
         task = subprocess.Popen([
             'task', 'rc:%s' % self.config_filename,
             'rc.verbose=nothing', search,
-            'export'], stdout=subprocess.PIPE).communicate()[0].decode(encoding)
+            'export'], stdout=subprocess.PIPE).communicate()[0].decode()
         if task:
             try:
                 task_data = json.loads(task)