From 5b0199873e9d58d5d3e33f5e8953ca47a8f9618a Mon Sep 17 00:00:00 2001 From: dave Date: Sun, 24 Jul 2016 13:05:12 -0700 Subject: [PATCH] Reorganize module --- b2mirror/mirror.py | 4 ++-- b2mirror/plugin/__init__.py | 0 b2mirror/{ => plugin}/b2plugin.py | 0 b2mirror/{ => plugin}/base.py | 0 b2mirror/{ => plugin}/localplugin.py | 0 setup.py | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 b2mirror/plugin/__init__.py rename b2mirror/{ => plugin}/b2plugin.py (100%) rename b2mirror/{ => plugin}/base.py (100%) rename b2mirror/{ => plugin}/localplugin.py (100%) diff --git a/b2mirror/mirror.py b/b2mirror/mirror.py index d5a0cf2..ed90684 100644 --- a/b2mirror/mirror.py +++ b/b2mirror/mirror.py @@ -3,8 +3,8 @@ from urllib.parse import urlparse from itertools import islice, filterfalse from concurrent.futures import ThreadPoolExecutor -from b2mirror.localplugin import LocalProvider -from b2mirror.b2plugin import B2Reciever +from b2mirror.plugin.localplugin import LocalProvider +from b2mirror.plugin.b2plugin import B2Reciever from b2mirror.common import results_ok import logging diff --git a/b2mirror/plugin/__init__.py b/b2mirror/plugin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/b2mirror/b2plugin.py b/b2mirror/plugin/b2plugin.py similarity index 100% rename from b2mirror/b2plugin.py rename to b2mirror/plugin/b2plugin.py diff --git a/b2mirror/base.py b/b2mirror/plugin/base.py similarity index 100% rename from b2mirror/base.py rename to b2mirror/plugin/base.py diff --git a/b2mirror/localplugin.py b/b2mirror/plugin/localplugin.py similarity index 100% rename from b2mirror/localplugin.py rename to b2mirror/plugin/localplugin.py diff --git a/setup.py b/setup.py index 8eb5ceb..c10d3bd 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup(name='b2mirror', url='http://gitlab.xmopx.net/dave/b2mirror', author='dpedu', author_email='dave@davepedu.com', - packages=['b2mirror'], + packages=['b2mirror', 'b2mirror.plugin'], scripts=['bin/b2mirror'], zip_safe=False, install_requires=['b2==0.6.2']