openstack
/
swift
Code Issues Proposed changes

Merge "py27: Suppress UnicodeWarnings in ShardRange setters"

This commit is contained in:
Zuul 2020-05-13 17:44:56 +00:00 committed by Gerrit Code Review
parent 0fd23ee546 fe74ec0489
commit 08db36a295
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swift/common/utils.py
View File

@ -48,6 +48,7 @@ import ctypes.util
from copy import deepcopy
from optparse import OptionParser
import traceback
import warnings
from tempfile import gettempdir, mkstemp, NamedTemporaryFile
import glob
@ -4985,8 +4986,10 @@ class ShardRange(object):
@lower.setter
def lower(self, value):
if value in (None, b'', u''):
value = ShardRange.MIN
with warnings.catch_warnings():
warnings.simplefilter('ignore', UnicodeWarning)
if value in (None, b'', u''):
value = ShardRange.MIN
try:
value = self._encode_bound(value)
except TypeError as err:
@ -5011,8 +5014,10 @@ class ShardRange(object):
@upper.setter
def upper(self, value):
if value in (None, b'', u''):
value = ShardRange.MAX
with warnings.catch_warnings():
warnings.simplefilter('ignore', UnicodeWarning)
if value in (None, b'', u''):
value = ShardRange.MAX
try:
value = self._encode_bound(value)
except TypeError as err:

13
test/unit/common/test_utils.py
View File

@ -44,6 +44,7 @@ import sys
import json
import math
import inspect
import warnings
import six
from six import StringIO
@ -7585,8 +7586,10 @@ class TestShardRange(unittest.TestCase):
expected = u'\N{SNOWMAN}'
if six.PY2:
expected = expected.encode('utf-8')
do_test(u'\N{SNOWMAN}', expected)
do_test(u'\N{SNOWMAN}'.encode('utf-8'), expected)
with warnings.catch_warnings(record=True) as captured_warnings:
do_test(u'\N{SNOWMAN}', expected)
do_test(u'\N{SNOWMAN}'.encode('utf-8'), expected)
self.assertFalse(captured_warnings)
sr = utils.ShardRange('a/c', utils.Timestamp.now(), 'b', 'y')
sr.lower = ''
@ -7633,8 +7636,10 @@ class TestShardRange(unittest.TestCase):
expected = u'\N{SNOWMAN}'
if six.PY2:
expected = expected.encode('utf-8')
do_test(u'\N{SNOWMAN}', expected)
do_test(u'\N{SNOWMAN}'.encode('utf-8'), expected)
with warnings.catch_warnings(record=True) as captured_warnings:
do_test(u'\N{SNOWMAN}', expected)
do_test(u'\N{SNOWMAN}'.encode('utf-8'), expected)
self.assertFalse(captured_warnings)
sr = utils.ShardRange('a/c', utils.Timestamp.now(), 'b', 'y')
sr.upper = ''