From 89dd6b363a2a7d8539c1377f9ee2d1fa9349f95d Mon Sep 17 00:00:00 2001 From: Dan McDougall Date: Fri, 20 May 2016 19:26:47 -0400 Subject: [PATCH] terminal.py: Forgot to re-add the imap and izip import lines in the last commit. --- gateone/__init__.py | 2 +- gateone/core/server.py | 2 +- gateone/static/gateone.js | 2 +- terminal/terminal.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gateone/__init__.py b/gateone/__init__.py index a820c509..daf45a91 100644 --- a/gateone/__init__.py +++ b/gateone/__init__.py @@ -3,7 +3,7 @@ __version_info__ = (1, 2, 0) __license__ = "AGPLv3" # ...or proprietary (see LICENSE.txt) __author__ = 'Dan McDougall ' -__commit__ = "20151122132622" # Gets replaced by git (holds the date/time) +__commit__ = "20160520190741" # Gets replaced by git (holds the date/time) import os GATEONE_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/gateone/core/server.py b/gateone/core/server.py index 617b2269..f667a262 100755 --- a/gateone/core/server.py +++ b/gateone/core/server.py @@ -19,7 +19,7 @@ } } __author__ = 'Dan McDougall ' -__commit__ = "20151122132622" # Gets replaced by git (holds the date/time) +__commit__ = "20160520190741" # Gets replaced by git (holds the date/time) # NOTE: Docstring includes reStructuredText markup for use with Sphinx. __doc__ = '''\ diff --git a/gateone/static/gateone.js b/gateone/static/gateone.js index 6a9e25e5..0d656848 100644 --- a/gateone/static/gateone.js +++ b/gateone/static/gateone.js @@ -82,7 +82,7 @@ The base object for all Gate One modules/plugins. */ GateOne.__name__ = "GateOne"; GateOne.__version__ = "1.2"; -GateOne.__commit__ = "20151122132622"; +GateOne.__commit__ = "20160520190741"; GateOne.__repr__ = function () { return "[" + this.__name__ + " " + this.__version__ + "]"; }; diff --git a/terminal/terminal.py b/terminal/terminal.py index 2ccac5d1..fe071f7d 100644 --- a/terminal/terminal.py +++ b/terminal/terminal.py @@ -152,6 +152,7 @@ from datetime import datetime, timedelta from functools import partial from collections import defaultdict +from itertools import imap, izip try: from collections import OrderedDict except ImportError: # Python <2.7 didn't have OrderedDict in collections