summaryrefslogtreecommitdiffstats
path: root/editor.py
diff options
context:
space:
mode:
Diffstat (limited to 'editor.py')
-rw-r--r--editor.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/editor.py b/editor.py
index 489c6cd3..883a1a83 100644
--- a/editor.py
+++ b/editor.py
@@ -13,6 +13,7 @@
13# See the License for the specific language governing permissions and 13# See the License for the specific language governing permissions and
14# limitations under the License. 14# limitations under the License.
15 15
16from __future__ import print_function
16import os 17import os
17import re 18import re
18import sys 19import sys
@@ -53,10 +54,10 @@ class Editor(object):
53 return e 54 return e
54 55
55 if os.getenv('TERM') == 'dumb': 56 if os.getenv('TERM') == 'dumb':
56 print >>sys.stderr,\ 57 print(
57"""No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR. 58"""No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR.
58Tried to fall back to vi but terminal is dumb. Please configure at 59Tried to fall back to vi but terminal is dumb. Please configure at
59least one of these before using this command.""" 60least one of these before using this command.""", file=sys.stderr)
60 sys.exit(1) 61 sys.exit(1)
61 62
62 return 'vi' 63 return 'vi'
@@ -67,7 +68,7 @@ least one of these before using this command."""
67 68
68 Args: 69 Args:
69 data : the text to edit 70 data : the text to edit
70 71
71 Returns: 72 Returns:
72 new value of edited text; None if editing did not succeed 73 new value of edited text; None if editing did not succeed
73 """ 74 """