Clean up some cruft
Change-Id: I262b6c8fbe01bd4e08e9c685fc61b429ccc2d7e3
This commit is contained in:
parent
477423f60a
commit
30ffafb3e5
13
setup.cfg
13
setup.cfg
@ -145,18 +145,5 @@ swift.diskfile =
|
|||||||
swift.object_audit_watcher =
|
swift.object_audit_watcher =
|
||||||
dark_data = swift.obj.watchers.dark_data:DarkDataWatcher
|
dark_data = swift.obj.watchers.dark_data:DarkDataWatcher
|
||||||
|
|
||||||
[egg_info]
|
|
||||||
tag_build =
|
|
||||||
tag_date = 0
|
|
||||||
tag_svn_revision = 0
|
|
||||||
|
|
||||||
[bdist_wheel]
|
[bdist_wheel]
|
||||||
universal = 1
|
universal = 1
|
||||||
|
|
||||||
[nosetests]
|
|
||||||
exe = 1
|
|
||||||
verbosity = 2
|
|
||||||
detailed-errors = 1
|
|
||||||
cover-package = swift
|
|
||||||
cover-html = true
|
|
||||||
cover-erase = true
|
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# See http://code.google.com/p/python-nose/issues/detail?id=373
|
|
||||||
# The code below enables nosetests to work with i18n _() blocks
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
@ -22,20 +20,7 @@ from contextlib import contextmanager
|
|||||||
import os
|
import os
|
||||||
from six import reraise
|
from six import reraise
|
||||||
|
|
||||||
try:
|
from unittest.util import safe_repr
|
||||||
from unittest.util import safe_repr
|
|
||||||
except ImportError:
|
|
||||||
# Probably py26
|
|
||||||
_MAX_LENGTH = 80
|
|
||||||
|
|
||||||
def safe_repr(obj, short=False):
|
|
||||||
try:
|
|
||||||
result = repr(obj)
|
|
||||||
except Exception:
|
|
||||||
result = object.__repr__(obj)
|
|
||||||
if not short or len(result) < _MAX_LENGTH:
|
|
||||||
return result
|
|
||||||
return result[:_MAX_LENGTH] + ' [truncated]...'
|
|
||||||
|
|
||||||
import warnings
|
import warnings
|
||||||
warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
|
warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
|
||||||
@ -59,10 +44,6 @@ if sys.version_info < (3, 2):
|
|||||||
|
|
||||||
from eventlet.green import socket
|
from eventlet.green import socket
|
||||||
|
|
||||||
# make unittests pass on all locale
|
|
||||||
import swift
|
|
||||||
setattr(swift, 'gettext_', lambda x: x)
|
|
||||||
|
|
||||||
from swift.common.utils import readconf
|
from swift.common.utils import readconf
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user