pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 08:39:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove PY3 conditional logic (#8149)

Browse Source
This commit is contained in:
Maxime Beauchemin 2019-09-02 12:46:18 -07:00 committed by GitHub
parent 522e8015cf
commit ee24539bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
superset/utils/core.py
View File

@ -30,7 +30,6 @@ import logging
import os import os
import signal import signal
import smtplib import smtplib
import sys
from time import struct_time from time import struct_time
import traceback import traceback
from typing import List, NamedTuple, Optional, Tuple, Union from typing import List, NamedTuple, Optional, Tuple, Union
@ -68,7 +67,6 @@ from superset.utils.dates import datetime_to_epoch, EPOCH
logging.getLogger("MARKDOWN").setLevel(logging.INFO) logging.getLogger("MARKDOWN").setLevel(logging.INFO)
PY3K = sys.version_info >= (3, 0)
DTTM_ALIAS = "__timestamp" DTTM_ALIAS = "__timestamp"
ADHOC_METRIC_EXPRESSION_TYPES = {"SIMPLE": "SIMPLE", "SQL": "SQL"} ADHOC_METRIC_EXPRESSION_TYPES = {"SIMPLE": "SIMPLE", "SQL": "SQL"}
@ -796,10 +794,8 @@ def zlib_compress(data):
>>> json_str = '{"test": 1}' >>> json_str = '{"test": 1}'
>>> blob = zlib_compress(json_str) >>> blob = zlib_compress(json_str)
""" """
if PY3K: if isinstance(data, str):
if isinstance(data, str): return zlib.compress(bytes(data, "utf-8"))
return zlib.compress(bytes(data, "utf-8"))
return zlib.compress(data)
return zlib.compress(data) return zlib.compress(data)
@ -812,13 +808,11 @@ def zlib_decompress(blob: bytes, decode: Optional[bool] = True) -> Union[bytes,
>>> got_str == json_str >>> got_str == json_str
True True
""" """
if PY3K: if isinstance(blob, bytes):
if isinstance(blob, bytes): decompressed = zlib.decompress(blob)
decompressed = zlib.decompress(blob) else:
else: decompressed = zlib.decompress(bytes(blob, "utf-8"))
decompressed = zlib.decompress(bytes(blob, "utf-8")) return decompressed.decode("utf-8") if decode else decompressed
return decompressed.decode("utf-8") if decode else decompressed
return zlib.decompress(blob)
_celery_app = None _celery_app = None