remove clint dependency

The package is not maintained anymore and we were barely using it

Author: spderosso

gitless/cli/gl.py

@@ -18,8 +18,6 @@
 else:
   from pbs import ErrorReturnCode
 
-from clint.textui import colored
-
 from gitless import core
 
 from . import (
@@ -44,9 +42,9 @@
 try:
   repo = core.Repository()
   try:
-    colored.DISABLE_COLOR = not repo.config.get_bool('color.ui')
+    pprint.DISABLE_COLOR = not repo.config.get_bool('color.ui')
   except pygit2.GitError:
-    colored.DISABLE_COLOR = (
+    prrint.DISABLE_COLOR = (
         repo.config['color.ui'] in ['no', 'never'])
 except (core.NotInRepoError, KeyError):
   pass

gitless/cli/gl_branch.py

@@ -7,8 +7,6 @@
 
 from __future__ import unicode_literals
 
-from clint.textui import colored
-
 from gitless import core
 
 from . import helpers, pprint
@@ -110,7 +108,7 @@ def _do_list(repo, list_remote, v=False):
   for b in (repo.lookup_branch(n) for n in sorted(repo.listall_branches())):
     current_str = '*' if b.is_current else ' '
     upstream_str = '(upstream is {0})'.format(b.upstream) if b.upstream else ''
-    color = colored.green if b.is_current else colored.yellow
+    color = pprint.green if b.is_current else pprint.yellow
     pprint.item(
         '{0} {1} {2}'.format(current_str, color(b.branch_name), upstream_str))
     if v:
@@ -121,7 +119,7 @@ def _do_list(repo, list_remote, v=False):
       branches = r.lookupall_branches() if v else r.listall_branches()
       b_remote = '' if v else r.name + '/'
       for b in branches:
-        pprint.item('  {0}'.format(colored.yellow(b_remote + str(b))))
+        pprint.item('  {0}'.format(pprint.yellow(b_remote + str(b))))
         if v:
           pprint.item('    ➜ head is {0}'.format(pprint.commit_str(b.head)))
 

gitless/cli/gl_status.py

@@ -9,8 +9,6 @@
 
 import os
 
-from clint.textui import colored
-
 from gitless import core
 
 from . import helpers, pprint
@@ -30,7 +28,7 @@ def parser(subparsers, repo):
 def main(args, repo):
   curr_b = repo.current_branch
   pprint.msg('On branch {0}, repo-directory {1}'.format(
-    colored.green(curr_b.branch_name), colored.green('//' + repo.cwd)))
+    pprint.green(curr_b.branch_name), pprint.green('//' + repo.cwd)))
 
   if curr_b.merge_in_progress:
     pprint.blank()
@@ -83,16 +81,16 @@ def _print_tracked_mod_files(tracked_mod_list, relative_paths, repo):
   root = repo.root
   for f in tracked_mod_list:
     exp = ''
-    color = colored.yellow
+    color = pprint.yellow
     if not f.exists_at_head:
       exp = ' (new file)'
-      color = colored.green
+      color = pprint.green
     elif not f.exists_in_wd:
       exp = ' (deleted)'
-      color = colored.red
+      color = pprint.red
     elif f.in_conflict:
       exp = ' (with conflicts)'
-      color = colored.cyan
+      color = pprint.cyan
 
     fp = os.path.relpath(os.path.join(root, f.fp)) if relative_paths else f.fp
     if fp == '.':
@@ -114,12 +112,12 @@ def _print_untracked_files(untracked_list, relative_paths, repo):
   root = repo.root
   for f in untracked_list:
     exp = ''
-    color = colored.blue
+    color = pprint.blue
     if f.in_conflict:
       exp = ' (with conflicts)'
-      color = colored.cyan
+      color = pprint.cyan
     elif f.exists_at_head:
-      color = colored.magenta
+      color = pprint.magenta
       if f.exists_in_wd:
         exp = ' (exists at head)'
       else:

gitless/cli/pprint.py

@@ -17,8 +17,7 @@
 import re
 import sys
 
-from clint.textui import colored, indent
-from clint.textui import puts as clint_puts
+DISABLE_COLOR = False
 
 from gitless import core
 
@@ -33,37 +32,74 @@
 
 
 def puts(s='', newline=True, stream=sys.stdout.write):
-  assert not IS_PY2 or (
-      isinstance(s, unicode) or isinstance(s, colored.ColoredString))
+  assert not IS_PY2 or isinstance(s, unicode)
 
   if IS_PY2:
     s = s.encode(ENCODING, errors='ignore')
-  clint_puts(s, newline=newline, stream=stream)
+  if newline:
+    s = s + '\n'
+  stream(s)
+
+
+# Colored strings
+RED = '\033[31m'
+RED_BOLD = '\033[1;31m'
+GREEN = '\033[32m'
+GREEN_BOLD = '\033[1;32m'
+YELLOW = '\033[33m'
+BLUE = '\033[34m'
+MAGENTA = '\033[35m'
+CYAN = '\033[36m'
+CLEAR = '\033[0m'
+
+def _color(color_code, text):
+  return '{0}{1}{2}'.format(color_code, text, CLEAR) if should_color() else text
+
+def should_color():
+  # We only output colored lines if the coloring is enabled and we are not being
+  # piped or redirected
+  return not DISABLE_COLOR and sys.stdout.isatty()
+
+def red(text):
+  return _color(RED, text)
+
+def green(text):
+  return _color(GREEN, text)
+
+def yellow(text):
+  return _color(YELLOW, text)
+
+def blue(text):
+  return _color(BLUE, text)
+
+def magenta(text):
+  return _color(MAGENTA, text)
+
+def cyan(text):
+  return _color(CYAN, text)
 
 
 # Stdout
 
 
 def ok(text):
-  puts(colored.green('✔ {0}'.format(text)))
+  puts(green('✔ {0}'.format(text)))
 
 
 def warn(text):
-  puts(colored.yellow('! {0}'.format(text)))
+  puts(yellow('! {0}'.format(text)))
 
 
 def msg(text, stream=sys.stdout.write):
   puts(text, stream=stream)
 
 
 def exp(text, stream=sys.stdout.write):
-  with indent(2):
-    puts('➜ {0}'.format(text), stream=stream)
+  puts('  ➜ {0}'.format(text), stream=stream)
 
 
 def item(i, opt_text='', stream=sys.stdout.write):
-  with indent(4):
-    puts('{0}{1}'.format(i, opt_text), stream=stream)
+  puts('    {0}{1}'.format(i, opt_text), stream=stream)
 
 
 def blank(stream=sys.stdout.write):
@@ -77,7 +113,7 @@ def sep(stream=sys.stdout.write):
 # Err
 
 def err(text):
-  puts(colored.red('✘ {0}'.format(text)), stream=sys.stderr.write)
+  puts(red('✘ {0}'.format(text)), stream=sys.stderr.write)
 
 
 def err_msg(text):
@@ -137,7 +173,7 @@ def commit_str(ci):
 
 def commit(ci, compact=False, stream=sys.stdout.write, line_additions=0, line_deletions=0):
   merge_commit = len(ci.parent_ids) > 1
-  color = colored.magenta if merge_commit else colored.yellow
+  color = magenta if merge_commit else yellow
   if compact:
     title = ci.message.splitlines()[0]
     puts('{0} {1}'.format(color(str(ci.id)[:7]), title), stream=stream)
@@ -154,11 +190,10 @@ def commit(ci, compact=False, stream=sys.stdout.write, line_additions=0, line_de
   puts(color('Date:      {0:%c %z}'.format(ci_author_dt)), stream=stream)
   put_s = lambda num: '' if num == 1 else 's'
   puts(color('Stats:     {0} line{1} added, {2} line{3} removed'
-    .format(line_additions, put_s(line_additions), 
+    .format(line_additions, put_s(line_additions),
       line_deletions, put_s(line_deletions))), stream=stream)
   puts(stream=stream)
-  with indent(4):
-    puts(ci.message, stream=stream)
+  puts('    {0}'.format(ci.message), stream=stream)
 
 # Op Callbacks
 
@@ -203,7 +238,7 @@ def diff(patch, stream=sys.stdout.write):
   new_fp = patch.delta.new_file.path
   puts('Diff of file "{0}"'.format(old_fp), stream=stream)
   if old_fp != new_fp:
-    puts(colored.cyan(' (renamed to {0})'.format(new_fp)), stream=stream)
+    puts(cyan(' (renamed to {0})'.format(new_fp)), stream=stream)
     puts(stream=stream)
 
   if patch.delta.is_binary:
@@ -242,7 +277,7 @@ def diff_totals(total_additions, total_deletions, stream=sys.stdout.write):
 
 
 def _hunk(hunk, stream=sys.stdout.write):
-  puts(colored.cyan('@@ -{0},{1} +{2},{3} @@'.format(
+  puts(cyan('@@ -{0},{1} +{2},{3} @@'.format(
       hunk.old_start, hunk.old_lines, hunk.new_start, hunk.new_lines)),
       stream=stream)
   padding = _padding(hunk)
@@ -305,21 +340,18 @@ def _format_line(diff_line, padding, bold_delim=None):
   Returns:
     a padded and colored version of the diff line with line numbers
   """
-  # Color constants
-  # We only output colored lines if the coloring is enabled and we are not being
-  # piped or redirected
-  if colored.DISABLE_COLOR or not sys.stdout.isatty():
-    GREEN = ''
-    GREEN_BOLD = ''
-    RED = ''
-    RED_BOLD = ''
-    CLEAR = ''
+  if should_color():
+    green = GREEN
+    green_bold = GREEN_BOLD
+    red = RED
+    red_bold = RED_BOLD
+    clear = CLEAR
   else:
-    GREEN = '\033[32m'
-    GREEN_BOLD = '\033[1;32m'
-    RED = '\033[31m'
-    RED_BOLD = '\033[1;31m'
-    CLEAR = '\033[0m'
+    green = ''
+    green_bold = ''
+    red = ''
+    red_bold = ''
+    clear = ''
 
   formatted = ''
   st = diff_line.origin
@@ -331,25 +363,25 @@ def _format_line(diff_line, padding, bold_delim=None):
     formatted = (
         str(old_lineno).ljust(padding) + str(new_lineno).ljust(padding) + line)
   elif st == '+':
-    formatted = ' ' * padding + GREEN + str(new_lineno).ljust(padding)
+    formatted = ' ' * padding + green + str(new_lineno).ljust(padding)
     if not bold_delim:
       formatted += line
     else:
       bold_start, bold_end = bold_delim
       formatted += (
-          line[:bold_start] + GREEN_BOLD + line[bold_start:bold_end] + CLEAR +
-          GREEN + line[bold_end:])
+          line[:bold_start] + green_bold + line[bold_start:bold_end] + clear +
+          green + line[bold_end:])
   elif st == '-':
-    formatted = RED + str(old_lineno).ljust(padding) + ' ' * padding
+    formatted = red + str(old_lineno).ljust(padding) + ' ' * padding
     if not bold_delim:
       formatted += line
     else:
       bold_start, bold_end = bold_delim
       formatted += (
-          line[:bold_start] + RED_BOLD + line[bold_start:bold_end] + CLEAR +
-          RED + line[bold_end:])
+          line[:bold_start] + red_bold + line[bold_start:bold_end] + clear +
+          red + line[bold_end:])
 
-  return formatted + CLEAR
+  return formatted + clear
 
 
 def _highlight(line1, line2):

requirements.txt

@@ -2,6 +2,5 @@
 
 argcomplete>=1.11.1
 pygit2==1.1.1  # requires libgit2 0.99 or 1.0
-clint==0.5.1
 sh==1.12.14;sys_platform!='win32'
 pbs==0.110;sys_platform=='win32'

setup.py

@@ -69,7 +69,6 @@
     install_requires=[
       # make sure it matches requirements.txt
       'pygit2==1.1.1', # requires libgit2 0.99 or 1.0
-      'clint>=0.3.6',
       'sh>=1.11' if sys.platform != 'win32' else 'pbs>=0.11',
       'argcomplete>=1.11.1'
     ],