paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply Python 3 futurize transform libmodernize.fixes.fix_imports_six.

Browse Source
This commit is contained in:
Tim Abbott
2015-11-01 08:14:36 -08:00
parent b3ac668779
commit 2ea0663a4a
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/zulip/__init__.py
View File

@@ -34,7 +34,7 @@ import urllib
import random import random
from distutils.version import LooseVersion from distutils.version import LooseVersion
from ConfigParser import SafeConfigParser from six.moves.configparser import SafeConfigParser
import logging import logging

2
bots/jabber_mirror_backend.py
View File

@@ -44,7 +44,7 @@ import optparse
from sleekxmpp import ClientXMPP, InvalidJID, JID from sleekxmpp import ClientXMPP, InvalidJID, JID
from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.exceptions import IqError, IqTimeout
from ConfigParser import SafeConfigParser from six.moves.configparser import SafeConfigParser
import os, sys, zulip, getpass import os, sys, zulip, getpass
import re import re

4
zerver/lib/bugdown/__init__.py
View File

@@ -10,7 +10,7 @@ import glob
import twitter import twitter
import platform import platform
import time import time
import HTMLParser import six.moves.html_parser
import httplib2 import httplib2
import itertools import itertools
import urllib import urllib
@@ -433,7 +433,7 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
## TODO: unescape is an internal function, so we should ## TODO: unescape is an internal function, so we should
## use something else if we can find it ## use something else if we can find it
text = HTMLParser.HTMLParser().unescape(res['text']) text = six.moves.html_parser.HTMLParser().unescape(res['text'])
urls = res.get('urls', {}) urls = res.get('urls', {})
user_mentions = res.get('user_mentions', []) user_mentions = res.get('user_mentions', [])
media = res.get('media', []) media = res.get('media', [])

2
zerver/lib/event_queue.py
View File

@@ -10,7 +10,7 @@ import socket
import logging import logging
import ujson import ujson
import requests import requests
import cPickle as pickle import six.moves.cPickle as pickle
import atexit import atexit
import sys import sys
import signal import signal

2
zilencer/management/commands/sync_api_key.py
View File

@@ -4,7 +4,7 @@ from __future__ import print_function
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from zerver.models import get_user_profile_by_email, UserProfile from zerver.models import get_user_profile_by_email, UserProfile
import os import os
from ConfigParser import SafeConfigParser from six.moves.configparser import SafeConfigParser
class Command(BaseCommand): class Command(BaseCommand):
help = """Sync your API key from ~/.zuliprc into your development instance""" help = """Sync your API key from ~/.zuliprc into your development instance"""

4
zproject/local_settings.py
View File

@@ -7,10 +7,10 @@
# On a normal Zulip production server, zproject/local_settings.py is a # On a normal Zulip production server, zproject/local_settings.py is a
# symlink to /etc/zulip/settings.py (based off local_settings_template.py). # symlink to /etc/zulip/settings.py (based off local_settings_template.py).
import platform import platform
import ConfigParser import six.moves.configparser
from base64 import b64decode from base64 import b64decode
config_file = ConfigParser.RawConfigParser() config_file = six.moves.configparser.RawConfigParser()
config_file.read("/etc/zulip/zulip.conf") config_file.read("/etc/zulip/zulip.conf")
# Whether we're running in a production environment. Note that PRODUCTION does # Whether we're running in a production environment. Note that PRODUCTION does

8
zproject/settings.py
View File

@@ -12,7 +12,7 @@ import os
import platform import platform
import time import time
import sys import sys
import ConfigParser import six.moves.configparser
from zerver.lib.db import TimeTrackingConnection from zerver.lib.db import TimeTrackingConnection
@@ -20,14 +20,14 @@ from zerver.lib.db import TimeTrackingConnection
# INITIAL SETTINGS # INITIAL SETTINGS
######################################################################## ########################################################################
config_file = ConfigParser.RawConfigParser() config_file = six.moves.configparser.RawConfigParser()
config_file.read("/etc/zulip/zulip.conf") config_file.read("/etc/zulip/zulip.conf")
# Whether this instance of Zulip is running in a production environment. # Whether this instance of Zulip is running in a production environment.
PRODUCTION = config_file.has_option('machine', 'deploy_type') PRODUCTION = config_file.has_option('machine', 'deploy_type')
DEVELOPMENT = not PRODUCTION DEVELOPMENT = not PRODUCTION
secrets_file = ConfigParser.RawConfigParser() secrets_file = six.moves.configparser.RawConfigParser()
if PRODUCTION: if PRODUCTION:
secrets_file.read("/etc/zulip/zulip-secrets.conf") secrets_file.read("/etc/zulip/zulip-secrets.conf")
else: else:
@@ -374,7 +374,7 @@ try:
domain = config_file.get('django', 'cookie_domain') domain = config_file.get('django', 'cookie_domain')
SESSION_COOKIE_DOMAIN = '.' + domain SESSION_COOKIE_DOMAIN = '.' + domain
CSRF_COOKIE_DOMAIN = '.' + domain CSRF_COOKIE_DOMAIN = '.' + domain
except ConfigParser.Error: except six.moves.configparser.Error:
# Failing here is OK # Failing here is OK
pass pass