Skip to content

Commit

Permalink
[ckan#3126] remove backported subprocess.check_output
Browse files Browse the repository at this point in the history
  • Loading branch information
Knut Hühne committed Jun 17, 2016
1 parent 9fb9f57 commit 82fe4fd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 54 deletions.
47 changes: 0 additions & 47 deletions ckan/lib/util.py

This file was deleted.

10 changes: 6 additions & 4 deletions ckan/tests/test_coding_standards.py
Expand Up @@ -15,8 +15,6 @@
import re
import subprocess

import ckan.lib.util as util


def test_building_the_docs():
'''There should be no warnings or errors when building the Sphinx docs.
Expand All @@ -28,8 +26,12 @@ def test_building_the_docs():
'''
try:
output = util.check_output(
['python', 'setup.py', 'build_sphinx', '--all-files', '--fresh-env'],
output = subprocess.check_output(
['python',
'setup.py',
'build_sphinx',
'--all-files',
'--fresh-env'],
stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as err:
assert False, (
Expand Down
4 changes: 1 addition & 3 deletions doc/conf.py
Expand Up @@ -18,8 +18,6 @@
import os
import subprocess

import ckan.lib.util as util

# If your extensions (or modules documented by autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand Down Expand Up @@ -126,7 +124,7 @@ def latest_release_tag():
This requires git to be installed.
'''
git_tags = util.check_output(
git_tags = subprocess.check_output(
['git', 'tag', '-l'], stderr=subprocess.STDOUT).split()

# FIXME: We could do more careful pattern matching against ckan-X.Y.Z here.
Expand Down

0 comments on commit 82fe4fd

Please sign in to comment.