x/stackalytics
Code Issues Proposed changes

Fix pep8 failure on py3

Browse Source 
pep8 check failed on python3 like

./stackalytics/dashboard/vault.py:48:30: F821 undefined name 'basestring'
        if not isinstance(o, basestring):
./stackalytics/dashboard/vault.py:51:20: F821 undefined name 'intern'
            return intern(o)
./stackalytics/dashboard/vault.py:52:26: F821 undefined name 'unicode'
        if isinstance(o, unicode):
                         ^

This patch fixes it by merging 2 versions of uniintern() into a single
method which supports both PY2 and PY3.

Change-Id: Ib18fcfffcdcc8628e7bca5b3558667fb371c956d
This commit is contained in:
Ken'ichi Ohmichi 2017-03-13 15:13:57 -07:00
parent 8534cff698
commit 293a5b5dc6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
stackalytics/dashboard/vault.py
View File

@ -16,7 +16,6 @@
import collections import collections
from datetime import timedelta from datetime import timedelta
import os import os
import sys
import flask import flask
from oslo_config import cfg from oslo_config import cfg
@ -42,23 +41,16 @@ RECORD_FIELDS_FOR_AGGREGATE = ['record_id', 'primary_key', 'record_type',
CompactRecord = collections.namedtuple('CompactRecord', CompactRecord = collections.namedtuple('CompactRecord',
RECORD_FIELDS_FOR_AGGREGATE) RECORD_FIELDS_FOR_AGGREGATE)
_unihash = {}
if six.PY2:
_unihash = {}
def uniintern(o): def uniintern(o):
if not isinstance(o, basestring): if isinstance(o, str):
return o return six.moves.intern(o)
if isinstance(o, str): if not isinstance(o, six.string_types[0]):
return intern(o) return o
if isinstance(o, unicode): if isinstance(o, six.text_type):
return _unihash.setdefault(o, o) return _unihash.setdefault(o, o)
else:
def uniintern(o):
if isinstance(o, str):
return sys.intern(o)
else:
return o
def compact_records(records): def compact_records(records):