[Python-modules-commits] [python3-proselint] 03/04: merge patched into master

[Víctor Cuadrado Juan]

This is an automated email from the git hooks/post-receive script.

viccuad-guest pushed a commit to branch master
in repository python3-proselint.

commit 87345c7966e616917bcacca8fa310530a323fd73
Merge: 61d89d0 ac711e7
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date:   Thu Jun 16 09:41:37 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...001-Remove-debug-clearcache-functionality.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 proselint/command_line.py                          | 14 --------
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 9e7d799,0000000..a36afed
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ba0c1d24e6988f0cb17057e0514dcb4298043363
- ba0c1d24e6988f0cb17057e0514dcb4298043363
++ac711e75abfd4f737aa95086803ae1296b8f3343
++ac711e75abfd4f737aa95086803ae1296b8f3343
 +ba0c1d24e6988f0cb17057e0514dcb4298043363
 +ba0c1d24e6988f0cb17057e0514dcb4298043363
 +python3-proselint_0.5.3.orig.tar.gz
 +0894408a070a9a6a1b2f3319ec442a440a36ad04
 +68983
diff --cc debian/patches/0001-Remove-debug-clearcache-functionality.patch
index 0000000,0000000..acb006c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-debug-clearcache-functionality.patch
@@@ -1,0 -1,0 +1,42 @@@
++From ac711e75abfd4f737aa95086803ae1296b8f3343 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= <me at viccuad.me>
++Date: Thu, 16 Jun 2016 09:38:57 +0200
++Subject: Remove `--debug` clearcache functionality
++
++Fixes #821886
++---
++ proselint/command_line.py | 14 --------------
++ 1 file changed, 14 deletions(-)
++
++diff --git a/proselint/command_line.py b/proselint/command_line.py
++index 8d1d6e4..911af52 100644
++--- a/proselint/command_line.py
+++++ b/proselint/command_line.py
++@@ -108,16 +108,6 @@ def timing_test(corpus="0.1.0"):
++     return time.time() - start
++ 
++ 
++-def clear_cache():
++-    """Delete the contents of the cache."""
++-    click.echo("Deleting the cache...")
++-    subprocess.call("find . -name '*.pyc' -delete", shell=True)
++-    subprocess.call(
++-        "rm -rfv proselint/cache > /dev/null && mkdir -p {}".format(
++-            os.path.join(os.path.expanduser("~"), ".proselint")),
++-        shell=True)
++-
++-
++ def errors_to_json(errors):
++     """Convert the errors to JSON."""
++     out = []
++@@ -188,10 +178,6 @@ def proselint(paths=None, version=None, initialize=None, clean=None,
++         click.echo(lintscore())
++         return
++ 
++-    # In debug or clean mode, delete cache & *.pyc files before running.
++-    if debug or clean:
++-        clear_cache()
++-
++     # Use the demo file by default.
++     if demo:
++         paths = [demo_file]
diff --cc debian/patches/series
index 0000000,0000000..feac9df
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-debug-clearcache-functionality.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python3-proselint.git