Merge "Clean up some cruft"

setup.cfg

@@ -145,18 +145,5 @@ swift.diskfile =
 swift.object_audit_watcher =
     dark_data = swift.obj.watchers.dark_data:DarkDataWatcher
 
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
 [bdist_wheel]
 universal = 1
-
-[nosetests]
-exe = 1
-verbosity = 2
-detailed-errors = 1
-cover-package = swift
-cover-html = true
-cover-erase = true

test/__init__.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # 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
 import sys
 from contextlib import contextmanager
@@ -22,20 +20,7 @@ from contextlib import contextmanager
 import os
 from six import reraise
 
-try:
-    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]...'
+from unittest.util import safe_repr
 
 import warnings
 warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
@@ -59,10 +44,6 @@ if sys.version_info < (3, 2):
 
 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