diff options
author | Lars Wirzenius <liw@liw.fi> | 2016-01-15 16:30:18 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2016-01-15 17:16:28 +0200 |
commit | 8630349a550fbed5dd52550920e5eecedc3fc146 (patch) | |
tree | 74824f0fed9cad2707522b0d7d34ce72566b9e77 | |
parent | 0f3ee37fe5816d8cc073a0439b98160a2ef48698 (diff) | |
download | obnam-8630349a550fbed5dd52550920e5eecedc3fc146.tar.gz |
Reorder imports
-rw-r--r-- | obnamlib/app.py | 5 | ||||
-rw-r--r-- | obnamlib/fmt_6/repo_fmt_6.py | 3 | ||||
-rw-r--r-- | obnamlib/hooks_tests.py | 3 | ||||
-rw-r--r-- | obnamlib/plugins/backup_plugin.py | 5 | ||||
-rw-r--r-- | obnamlib/plugins/fuse_plugin.py | 8 |
5 files changed, 13 insertions, 11 deletions
diff --git a/obnamlib/app.py b/obnamlib/app.py index 6b2e288f..24d439f2 100644 --- a/obnamlib/app.py +++ b/obnamlib/app.py @@ -14,13 +14,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -import cliapp -import larch import logging import socket import sys import time import tracing + +import cliapp +import larch import ttystatus import obnamlib diff --git a/obnamlib/fmt_6/repo_fmt_6.py b/obnamlib/fmt_6/repo_fmt_6.py index f2bf37d4..08fc4a1c 100644 --- a/obnamlib/fmt_6/repo_fmt_6.py +++ b/obnamlib/fmt_6/repo_fmt_6.py @@ -16,13 +16,14 @@ import errno import hashlib -import larch import logging import os import random import re import stat import time + +import larch import tracing import obnamlib diff --git a/obnamlib/hooks_tests.py b/obnamlib/hooks_tests.py index 1695f4d2..bac7cc27 100644 --- a/obnamlib/hooks_tests.py +++ b/obnamlib/hooks_tests.py @@ -14,12 +14,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +import base64 import unittest import obnamlib -import base64 - class HookTests(unittest.TestCase): diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py index ba5f69c6..2278ec10 100644 --- a/obnamlib/plugins/backup_plugin.py +++ b/obnamlib/plugins/backup_plugin.py @@ -21,11 +21,12 @@ import os import re import stat import traceback -import tracing import urlparse -import obnamlib import larch +import tracing + +import obnamlib class RepositorySettingMissingError(obnamlib.ObnamError): diff --git a/obnamlib/plugins/fuse_plugin.py b/obnamlib/plugins/fuse_plugin.py index 8c63bd44..6e5aa4bc 100644 --- a/obnamlib/plugins/fuse_plugin.py +++ b/obnamlib/plugins/fuse_plugin.py @@ -20,10 +20,6 @@ import logging import errno import struct -import tracing - -import obnamlib - try: import fuse fuse.fuse_python_api = (0, 2) @@ -37,6 +33,10 @@ except ImportError: self.__dict__.update(kwds) fuse = Bunch(Fuse=object) +import tracing + +import obnamlib + class FileNotFoundError(obnamlib.ObnamError): |