Skip to content

Commit

Permalink
One minor tweak to fix a getLogger in rst_to_html
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Sep 26, 2017
1 parent e629c16 commit ee600ff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/galaxy/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import collections
import errno
import json
import logging
import os
import random
import re
Expand Down Expand Up @@ -49,10 +48,11 @@
docutils_html4css1 = None

from .inflection import English, Inflector
from .logging import get_logger

inflector = Inflector(English)

log = logging.getLogger(__name__)
log = get_logger(__name__)
_lock = threading.RLock()

CHUNK_SIZE = 65536 # 64k
Expand Down Expand Up @@ -762,7 +762,7 @@ def update(self, values):

def rst_to_html(s, error=False):
"""Convert a blob of reStructuredText to HTML"""
log = logging.getLogger("docutils")
log = get_logger("docutils")

if docutils_core is None:
raise Exception("Attempted to use rst_to_html but docutils unavailable.")
Expand Down

0 comments on commit ee600ff

Please sign in to comment.