openstack/api-site
Code Issues Proposed changes

Cleanup py27 support

Browse Source 
The repo is now building with py3 only, so remove Py27 support.

Change-Id: I6e2eb0b0c31c3dff676241570ebe2f1e852dfc0e
This commit is contained in:
Andreas Jaeger 2020-04-12 18:39:38 +02:00 committed by Andreas Jaeger
parent 8de4ff8340
commit 5c9eb70f6f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test-requirements.txt
View File

@ -4,8 +4,7 @@
pbr>=2.0.0,!=2.1.0 # Apache-2.0 pbr>=2.0.0,!=2.1.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD sphinx>=2.0 # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
openstack-doc-tools>=1.8.0 # Apache-2.0 openstack-doc-tools>=1.8.0 # Apache-2.0
Jinja2>=2.10 Jinja2>=2.10
@ -13,4 +12,3 @@ Jinja2>=2.10
requests requests
os-service-types os-service-types
lxml!=3.7.0,>=3.4.1 # BSD lxml!=3.7.0,>=3.4.1 # BSD
six>=1.10.0 # MIT

6
tools/www-generator.py
View File

@ -15,7 +15,6 @@
import argparse import argparse
import logging import logging
import os import os
import six
import sys import sys
import lxml.html import lxml.html
@ -115,10 +114,7 @@ def main():
os.makedirs(target_directory) os.makedirs(target_directory)
logger.debug("writing %s" % target_file) logger.debug("writing %s" % target_file)
with open(os.path.join(target_file), 'wb') as fh: with open(os.path.join(target_file), 'wb') as fh:
if six.PY3: fh.write(output)
fh.write(output)
else:
fh.write(output.encode('utf8'))
except (IOError, OSError, UnicodeEncodeError) as e: except (IOError, OSError, UnicodeEncodeError) as e:
logger.error("writing %s failed: %s" % (target_file, e)) logger.error("writing %s failed: %s" % (target_file, e))
raise raise