[Python-modules-commits] [python-fs] 04/17: merge patched into master
Jan Dittberner
jandd at moszumanska.debian.org
Sun Jan 3 19:30:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
jandd pushed a commit to branch master
in repository python-fs.
commit 90df7f6d7e901a880de7194b732a00c9f1b5e1e8
Merge: dc31ed2 6030731
Author: Jan Dittberner <jandd at debian.org>
Date: Sun Jan 3 18:19:41 2016 +0100
merge patched into master
CHANGES.txt | 106 ++++
LICENSE.txt | 28 ++
MANIFEST.in | 5 +
PKG-INFO | 82 ++-
README.txt | 67 +++
debian/.git-dpm | 6 +-
debian/patches/wxpython3.0.patch | 4 +-
fs.egg-info/PKG-INFO | 86 ++++
fs.egg-info/SOURCES.txt | 118 +++++
fs.egg-info/dependency_links.txt | 1 +
fs.egg-info/entry_points.txt | 12 +
fs.egg-info/pbr.json | 1 +
fs.egg-info/requires.txt | 2 +
fs.egg-info/top_level.txt | 1 +
fs.egg-info/version_info.json | 6 +
fs/__init__.py | 15 +-
fs/appdirfs.py | 26 +-
fs/appdirs.py | 1 -
fs/base.py | 742 ++++++++++++++++------------
fs/batch.py | 155 ------
fs/browsewin.py | 6 +-
fs/commands/fscat | 3 -
fs/commands/fscp | 3 -
fs/commands/fsinfo | 3 -
fs/commands/fsls | 3 -
fs/commands/fsls.py | 138 +++---
fs/commands/fsmkdir | 3 -
fs/commands/fsmount | 3 -
fs/commands/fsmount.py | 75 ++-
fs/commands/fsmv | 3 -
fs/commands/fsrm | 3 -
fs/commands/fsserve | 3 -
fs/commands/fsserve.py | 76 +--
fs/commands/fstree | 3 -
fs/commands/fstree.py | 30 +-
fs/commands/runner.py | 240 ++++-----
fs/compatibility.py | 49 ++
fs/contrib/archivefs.py | 513 +++++++++++++++++++
fs/contrib/davfs/__init__.py | 59 ++-
fs/contrib/davfs/xmlobj.py | 1 +
fs/contrib/sqlitefs.py | 705 ++++++++++++++++++++++++++
fs/contrib/tahoelafs/__init__.py | 4 +-
fs/errors.py | 42 +-
fs/expose/django_storage.py | 2 +-
fs/expose/dokan/__init__.py | 133 ++---
fs/expose/ftp.py | 292 +++++++++++
fs/expose/fuse/__init__.py | 194 +++++---
fs/expose/fuse/{fuse_ctypes.py => fuse.py} | 162 +++---
fs/expose/fuse/{fuse_ctypes.py => fuse3.py} | 192 ++++---
fs/expose/fuse/fuse_ctypes.py | 81 ++-
fs/expose/http.py | 52 +-
fs/expose/importhook.py | 14 +-
fs/expose/sftp.py | 184 ++++---
fs/expose/wsgi/dirtemplate.py | 23 +-
fs/expose/wsgi/serve_home.py | 8 +-
fs/expose/wsgi/wsgi.py | 113 ++---
fs/expose/xmlrpc.py | 50 +-
fs/filelike.py | 125 ++---
fs/ftpfs.py | 354 ++++++-------
fs/httpfs.py | 48 +-
fs/iotools.py | 255 ++++++++++
fs/memoryfs.py | 246 +++++----
fs/mountfs.py | 124 +++--
fs/multifs.py | 113 +++--
fs/opener.py | 484 +++++++++---------
fs/osfs/__init__.py | 197 +++++---
fs/osfs/watch.py | 2 +
fs/osfs/watch_inotify.py | 8 +-
fs/osfs/watch_win32.py | 48 +-
fs/osfs/xattrs.py | 8 +-
fs/path.py | 281 ++++++-----
fs/remote.py | 116 ++---
fs/remotefs.py | 191 +++++++
fs/rpcfs.py | 174 ++++---
fs/s3fs.py | 71 ++-
fs/sftpfs.py | 278 ++++++-----
fs/tempfs.py | 62 ++-
fs/tests/__init__.py | 732 ++++++++++++++++-----------
fs/tests/data/UTF-8-demo.txt | 212 ++++++++
fs/tests/test_archivefs.py | 198 ++++++++
fs/tests/test_errors.py | 6 +
fs/tests/test_expose.py | 135 +----
fs/tests/test_fs.py | 29 +-
fs/tests/test_ftpfs.py | 36 +-
fs/tests/test_importhook.py | 19 +-
fs/tests/test_iotools.py | 56 +++
fs/tests/test_mountfs.py | 83 ++++
fs/tests/test_multifs.py | 85 ++++
fs/tests/test_opener.py | 32 ++
fs/tests/test_path.py | 41 +-
fs/tests/test_remote.py | 121 ++---
fs/tests/test_rpcfs.py | 100 ++++
fs/tests/test_s3fs.py | 10 +-
fs/tests/test_sqlitefs.py | 17 +
fs/tests/test_utils.py | 115 +++++
fs/tests/test_watch.py | 35 +-
fs/tests/test_wrapfs.py | 11 +-
fs/tests/test_xattr.py | 13 +-
fs/tests/test_zipfs.py | 79 +--
fs/tests/zipfs_binary_test.py | 45 ++
fs/utils.py | 383 +++++++++-----
fs/watch.py | 57 ++-
fs/wrapfs/__init__.py | 89 ++--
fs/wrapfs/hidedotfilesfs.py | 3 +-
fs/wrapfs/hidefs.py | 54 ++
fs/wrapfs/lazyfs.py | 4 +-
fs/wrapfs/limitsizefs.py | 26 +-
fs/wrapfs/readonlyfs.py | 32 +-
fs/wrapfs/subfs.py | 67 +--
fs/zipfs.py | 106 ++--
setup.cfg | 5 +
setup.py | 44 +-
112 files changed, 7823 insertions(+), 3374 deletions(-)
diff --cc debian/.git-dpm
index 4e45c79,0000000..7ececba
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
- 1af54040600c9cf56c177efe5c852cf32f9d9dfd
- 1af54040600c9cf56c177efe5c852cf32f9d9dfd
- 25730d548b2c03633395ecc8a9de8a026fa08aec
++60307317b7de703eb1e9479be9e8f751b6693fa4
++60307317b7de703eb1e9479be9e8f751b6693fa4
++21729b195c6b02d31adc0cbd26282d28ffbd20bf
+21729b195c6b02d31adc0cbd26282d28ffbd20bf
+python-fs_0.5.4.orig.tar.gz
+a65e66b97a33317da9a73e4fff75b62ccd13a9ab
+231333
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/wxpython3.0.patch
index 08ab5ac,0000000..df4791c
mode 100644,000000..100644
--- a/debian/patches/wxpython3.0.patch
+++ b/debian/patches/wxpython3.0.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 1af54040600c9cf56c177efe5c852cf32f9d9dfd Mon Sep 17 00:00:00 2001
++From 60307317b7de703eb1e9479be9e8f751b6693fa4 Mon Sep 17 00:00:00 2001
+From: Olly Betts <olly at survex.com>
+Date: Thu, 8 Oct 2015 12:05:47 -0700
+Subject: Update for wxPython 3.0
+
+Bug-Debian: https://bugs.debian.org/759054
+Forwarded: no
+Last-Update: 2014-09-13
+
+Patch-Name: wxpython3.0.patch
+---
+ fs/browsewin.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/browsewin.py b/fs/browsewin.py
- index cedd3de..6566462 100644
++index 9ce44fe..4baaf9b 100644
+--- a/fs/browsewin.py
++++ b/fs/browsewin.py
+@@ -187,7 +187,7 @@ def browse(fs, hide_dotfiles=False):
+
+ """
+
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+ frame = BrowseFrame(fs, hide_dotfiles=hide_dotfiles)
+ frame.Show()
+ app.MainLoop()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-fs.git
More information about the Python-modules-commits
mailing list