[Python-modules-commits] [python-pyftpdlib] 03/04: merge patched into master
Wolfgang Borgert
debacle at moszumanska.debian.org
Tue Oct 11 23:59:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-pyftpdlib.
commit 19f239a63f04ebd27590c07293d70cf571357f35
Merge: a4b6752 333ae10
Author: W. Martin Borgert <debacle at debian.org>
Date: Mon Oct 10 23:31:39 2016 +0000
merge patched into master
.git-pre-commit | 47 +
.travis.yml | 20 -
HISTORY.rst | 53 +
LICENSE | 2 +-
MANIFEST.in | 9 +-
Makefile | 55 +-
PKG-INFO | 287 ++++
README.rst | 7 +-
debian/.git-dpm | 6 +-
debian/patches/0001-fix-update-MANIFEST-file.patch | 29 -
debian/patches/series | 1 -
demo/anti_flood_ftpd.py | 33 +-
demo/basic_ftpd.py | 31 +-
demo/md5_ftpd.py | 51 +-
demo/multi_proc_ftp.py | 33 +-
demo/multi_thread_ftp.py | 33 +-
demo/throttled_ftpd.py | 39 +-
demo/tls_ftpd.py | 35 +-
demo/unix_daemon.py | 72 +-
demo/unix_ftpd.py | 35 +-
demo/winnt_ftpd.py | 33 +-
docs/Makefile | 177 ---
docs/README.rst | 15 -
docs/_static/copybutton.js | 57 -
docs/_static/favicon.ico | Bin 15086 -> 0 bytes
docs/_static/logo.png | Bin 13008 -> 0 bytes
docs/_static/sidebar.js | 161 --
docs/_template/globaltoc.html | 12 -
docs/_template/indexcontent.html | 4 -
docs/_template/indexsidebar.html | 8 -
docs/_template/page.html | 66 -
docs/_themes/pydoctheme/static/pydoctheme.css | 187 ---
docs/_themes/pydoctheme/theme.conf | 23 -
docs/adoptions.rst | 340 ----
docs/api.rst | 615 -------
docs/benchmarks.rst | 274 ----
docs/conf.py | 262 ---
docs/faqs.rst | 385 -----
docs/index.rst | 27 -
docs/install.rst | 43 -
docs/make.bat | 242 ---
docs/rfc-compliance.rst | 296 ----
docs/tutorial.rst | 536 -------
make.bat | 10 +-
pyftpdlib.egg-info/PKG-INFO | 287 ++++
pyftpdlib.egg-info/SOURCES.txt | 45 +
pyftpdlib.egg-info/dependency_links.txt | 1 +
pyftpdlib.egg-info/requires.txt | 6 +
pyftpdlib.egg-info/top_level.txt | 1 +
pyftpdlib/__init__.py | 49 +-
pyftpdlib/__main__.py | 52 +-
pyftpdlib/_compat.py | 70 +-
pyftpdlib/authorizers.py | 89 +-
pyftpdlib/contrib/__init__.py | 3 -
pyftpdlib/contrib/authorizers.py | 47 -
pyftpdlib/contrib/filesystems.py | 40 -
pyftpdlib/contrib/handlers.py | 40 -
pyftpdlib/filesystems.py | 40 +-
pyftpdlib/ftpserver.py | 89 --
pyftpdlib/handlers.py | 791 +++++----
pyftpdlib/ioloop.py | 512 +++---
pyftpdlib/log.py | 80 +-
pyftpdlib/servers.py | 152 +-
pyftpdlib/test/README | 5 +
pyftpdlib/test/__init__.py | 282 ++++
{test => pyftpdlib/test}/keycert.pem | 0
pyftpdlib/test/runner.py | 33 +
pyftpdlib/test/test_authorizers.py | 554 +++++++
pyftpdlib/test/test_filesystems.py | 219 +++
.../test/test_functional.py | 1674 ++++++--------------
pyftpdlib/test/test_functional_ssl.py | 373 +++++
pyftpdlib/test/test_ioloop.py | 291 ++++
pyftpdlib/test/test_servers.py | 223 +++
test/bench.py => scripts/ftpbench | 434 ++---
setup.cfg | 5 +
setup.py | 94 +-
test/test_contrib.py | 963 -----------
tox.ini | 29 -
78 files changed, 4478 insertions(+), 7746 deletions(-)
diff --cc debian/.git-dpm
index c18ce4d,0000000..bb11bcd
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
- beec4f8fb3f0af7db786433c7906768fae696c4d
- beec4f8fb3f0af7db786433c7906768fae696c4d
- da5dc2d853b22a412fdba704a9b61bce1ed2ea80
++333ae10df2adecae4973ce28485c822850c9bb13
++333ae10df2adecae4973ce28485c822850c9bb13
++333ae10df2adecae4973ce28485c822850c9bb13
+333ae10df2adecae4973ce28485c822850c9bb13
+python-pyftpdlib_1.5.1.orig.tar.gz
+8dcc5a6f344aa5db8b3bf758726a0499e6220f69
+127582
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pyftpdlib.git
More information about the Python-modules-commits
mailing list