Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

2.x compatibility

Browse Source
This commit is contained in:
Joel Schaerer 2010-10-24 11:42:45 +02:00
parent c25668f4f7
commit 19927146dd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autojump
View File

@ -23,7 +23,7 @@ except ImportError:
import pickle import pickle
import getopt import getopt
from sys import argv,exit,stderr from sys import argv,exit,stderr,version_info
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
import os import os
import signal import signal
@ -112,8 +112,11 @@ def find_matches(dirs,patterns,result_list,ignore_case,max_matches):
def open_dic(dic_file,error_recovery=False): def open_dic(dic_file,error_recovery=False):
try: try:
aj_file=open(dic_file, 'rb') aj_file=open(dic_file, 'rb')
if version_info.major>2:
#encoding is only specified for python2.x compatibility #encoding is only specified for python2.x compatibility
path_dict=pickle.load(aj_file,encoding="utf-8") path_dict=pickle.load(aj_file,encoding="utf-8")
else:
path_dict=pickle.load(aj_file)
aj_file.close() aj_file.close()
return path_dict return path_dict
except (IOError,EOFError,pickle.UnpicklingError): except (IOError,EOFError,pickle.UnpicklingError):