aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-07 02:15:03 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-05-09 23:18:38 +0200
commit33bfea31b0cd630f6494cf91d06c807f03d29a85 (patch)
treea6aad85bc6a8d5213b125189d67257aba802706b
parent34b6a3d944512fd544a884b018297a44aff928ab (diff)
downloadrneovim-33bfea31b0cd630f6494cf91d06c807f03d29a85.tar.gz
rneovim-33bfea31b0cd630f6494cf91d06c807f03d29a85.tar.bz2
rneovim-33bfea31b0cd630f6494cf91d06c807f03d29a85.zip
msgpack.vim: fix syntax errors, python2 errors
-rw-r--r--runtime/autoload/msgpack.vim10
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/autoload/msgpack.vim b/runtime/autoload/msgpack.vim
index a10ac32469..6b44af56d5 100644
--- a/runtime/autoload/msgpack.vim
+++ b/runtime/autoload/msgpack.vim
@@ -43,6 +43,7 @@ function s:msgpack_init_python() abort
for suf in ['', '3']
try
execute 'python' . suf
+ \. "\n"
\. "def shada_dict_strftime():\n"
\. " import datetime\n"
\. " import vim\n"
@@ -60,12 +61,15 @@ function s:msgpack_init_python() abort
\. " fmt = vim.eval('a:format')\n"
\. " timestr = vim.eval('a:string')\n"
\. " timestamp = datetime.datetime.strptime(timestr, fmt)\n"
- \. " timestamp = int(timestamp.timestamp())\n"
+ \. " try:\n"
+ \. " timestamp = int(timestamp.timestamp())\n"
+ \. " except:\n"
+ \. " timestamp = int(timestamp.strftime('%s'))\n"
\. " if timestamp > 2 ** 31:\n"
- \. " tsabs = abs(timestamp)"
+ \. " tsabs = abs(timestamp)\n"
\. " return ('{\"_TYPE\": v:msgpack_types.integer,'\n"
\. " + '\"_VAL\": [{sign},{v1},{v2},{v3}]}').format(\n"
- \. " sign=1 if timestamp >= 0 else -1,\n"
+ \. " sign=(1 if timestamp >= 0 else -1),\n"
\. " v1=((tsabs >> 62) & 0x3),\n"
\. " v2=((tsabs >> 31) & (2 ** 31 - 1)),\n"
\. " v3=(tsabs & (2 ** 31 - 1)))\n"