Merge remote-tracking branch 'origin/master' into custom_commands2

This commit is contained in:
Michael Lazar
2016-07-26 23:06:37 -07:00
2 changed files with 16 additions and 0 deletions

View File

@@ -5,7 +5,9 @@ import os
import sys
import locale
import logging
import warnings
import six
import praw
import tornado
@@ -34,6 +36,10 @@ def main():
# Squelch SSL warnings
logging.captureWarnings(True)
if six.PY3:
# These ones get triggered even when capturing warnings is turned on
warnings.simplefilter('ignore', ResourceWarning)
locale.setlocale(locale.LC_ALL, '')
# Set the terminal title