summaryrefslogtreecommitdiffstats
path: root/tosca2heat/heat-translator/translator/common
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-09-14 14:36:33 +0800
committershangxdy <shang.xiaodong@zte.com.cn>2016-09-14 16:00:06 +0800
commitf977b94e012828cd2a905b9b841aff33c4b732f8 (patch)
treef175b52c811f48335aeaa82d0c20baab8a99881d /tosca2heat/heat-translator/translator/common
parentae543033a8c4af9c291261fec55859c2f1191a1a (diff)
Update the upstream of tosco-parser and heat-translator to stable
release 0.6/0.5 Currently the parser is based on dev branch of upstream projects, include tosco-parser and heat-translator, for the colorado release of parser, it should be based on a stable version, so it's necessary to update the upstream version to 0.6/tosca-parser and 0.5/heat-translator. JIRA:PARSER-106 Change-Id: I8fb043068d25188c47e5648e1b66184446ac82d6 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/common')
-rw-r--r--tosca2heat/heat-translator/translator/common/utils.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/tosca2heat/heat-translator/translator/common/utils.py b/tosca2heat/heat-translator/translator/common/utils.py
index 8e4b690..459b5ee 100644
--- a/tosca2heat/heat-translator/translator/common/utils.py
+++ b/tosca2heat/heat-translator/translator/common/utils.py
@@ -18,7 +18,6 @@ import numbers
import os
import re
import requests
-import six
from six.moves.urllib.parse import urlparse
import yaml
@@ -263,17 +262,12 @@ class UrlUtils(object):
def str_to_num(value):
"""Convert a string representation of a number into a numeric type."""
- if isinstance(value, numbers.Number) \
- or isinstance(value, six.integer_types) \
- or isinstance(value, float):
+ if isinstance(value, numbers.Number):
return value
try:
return int(value)
except ValueError:
- try:
- return float(value)
- except ValueError:
- return None
+ return float(value)
def check_for_env_variables():