[Python-modules-commits] [python-django-extensions] 04/05: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository python-django-extensions.

commit 4fbe63f156471d7316f9dfbb6dc254ab5330c2de
Merge: 3a9894d 3b05e07
Author: Brian May <bam at debian.org>
Date:   Sun Jan 3 15:46:51 2016 +1100

    merge patched into master

 .gitignore                                         |   1 +
 .travis.yml                                        |   9 ++
 CHANGELOG.md                                       |  18 ++++
 README.rst                                         |   2 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/0001-01-werkzeug-package.diff.patch |   6 +-
 django_extensions/__init__.py                      |   2 +-
 django_extensions/admin/__init__.py                |  10 +-
 django_extensions/admin/widgets.py                 |   6 --
 django_extensions/compat.py                        | 109 +++++++++++++++++++-
 .../management/commands/sample.py.tmpl             |   3 +-
 django_extensions/db/fields/json.py                |   2 +-
 django_extensions/management/base.py               |   2 +-
 .../management/commands/admin_generator.py         |   5 +-
 .../management/commands/drop_test_database.py      |  12 +--
 .../management/commands/dumpscript.py              |  16 +--
 django_extensions/management/commands/reset_db.py  |  12 +--
 .../management/commands/runserver_plus.py          |  38 +++++--
 ...{show_templatetags.py => show_template_tags.py} |  15 +--
 .../management/commands/show_templatetags.py       | 112 ++-------------------
 .../management/commands/unreferenced_files.py      |   7 +-
 .../management/commands/validate_templates.py      |   5 +-
 django_extensions/management/modelviz.py           |  22 ++--
 .../django_extensions/js/jquery-1.7.2.min.js       |   4 -
 django_extensions/utils/dia2django.py              |   2 +-
 django_extensions/utils/validatingtemplatetags.py  |   2 +-
 docs/AUTHORS                                       |   1 +
 docs/command_signals.rst                           |   4 +-
 docs/conf.py                                       |   4 +-
 docs/creating_release.txt                          |   4 +-
 docs/index.rst                                     |   2 +-
 docs/runserver_plus.rst                            |   2 +-
 setup.cfg                                          |   1 +
 tests/test_json_field.py                           |   1 +
 tests/test_management_command.py                   |   7 +-
 tox.ini                                            |  15 ++-
 36 files changed, 262 insertions(+), 207 deletions(-)

diff --cc debian/.git-dpm
index f584ef8,0000000..c3c3172
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- df2917feaf0e7f594df643db475e7abc1fc4ab7e
- df2917feaf0e7f594df643db475e7abc1fc4ab7e
- 9e6fc9d532df2ce38eaab6e0409af25c193331d8
++3b05e07ea0d6447606af73efc8e8c4a303d21fc3
++3b05e07ea0d6447606af73efc8e8c4a303d21fc3
++e8e55ed79fca5962cfdf96bd3c9340e9a0c5b98b
 +e8e55ed79fca5962cfdf96bd3c9340e9a0c5b98b
 +python-django-extensions_1.6.1.orig.tar.gz
 +5d0f9ab626ed127820f8966faaade4d98b876ab5
 +170321
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-01-werkzeug-package.diff.patch
index bf9b0b1,0000000..cbc0f15
mode 100644,000000..100644
--- a/debian/patches/0001-01-werkzeug-package.diff.patch
+++ b/debian/patches/0001-01-werkzeug-package.diff.patch
@@@ -1,25 -1,0 +1,25 @@@
- From df2917feaf0e7f594df643db475e7abc1fc4ab7e Mon Sep 17 00:00:00 2001
++From 3b05e07ea0d6447606af73efc8e8c4a303d21fc3 Mon Sep 17 00:00:00 2001
 +From: Chris Lamb <lamby at debian.org>
 +Date: Sat, 24 Oct 2015 14:34:26 +1100
 +Subject: 01-werkzeug-package.diff
 +
 +Description:
 + Point people towards installing the python-werzeug package, not to download
 + random files from the internet.
 +---
 + django_extensions/management/commands/runserver_plus.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/django_extensions/management/commands/runserver_plus.py b/django_extensions/management/commands/runserver_plus.py
- index cfa5ff8..ad36249 100644
++index ef1d03f..3986a06 100644
 +--- a/django_extensions/management/commands/runserver_plus.py
 ++++ b/django_extensions/management/commands/runserver_plus.py
- @@ -158,7 +158,7 @@ class Command(BaseCommand):
++@@ -173,7 +173,7 @@ class Command(BaseCommand):
 +                     pass
 + 
 +         except ImportError:
 +-            raise CommandError("Werkzeug is required to use runserver_plus.  Please visit http://werkzeug.pocoo.org/ or install via pip. (pip install Werkzeug)")
 ++            raise CommandError("Werkzeug is required to use runserver_plus.  Please install `python-werkzeug'")
 + 
 +         pdb_option = options.get('pdb', False)
 +         ipdb_option = options.get('ipdb', False)

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