integrations: Remove usage of six.
MODIFY
zulip/integrations/bridge_with_matrix/matrix_bridge.py
zulip/integrations/bridge_with_matrix/matrix_bridge.py
@@ -7,7 +7,7 @@ import zulip
import sys
import argparse
import re
-from six.moves import configparser
+import configparser
from collections import OrderedDict

MODIFY
zulip/integrations/codebase/zulip_codebase_mirror
zulip/integrations/codebase/zulip_codebase_mirror
@@ -31,7 +31,6 @@ VERSION = "0.9"
if config.ZULIP_API_PATH is not None:
sys.path.append(config.ZULIP_API_PATH)
-import six
import zulip
from typing import Any, List, Dict, Optional
@@ -301,7 +300,7 @@ def check_permissions():
sys.stderr.write(str(e))
if __name__ == "__main__":
- if not isinstance(config.RESUME_FILE, six.string_types):
+ if not isinstance(config.RESUME_FILE, str):
sys.stderr.write("RESUME_FILE path not given; refusing to continue")
check_permissions()
if config.LOG_FILE:

MODIFY
zulip/integrations/google/google-calendar
zulip/integrations/google/google-calendar
@@ -10,7 +10,7 @@ import logging
import argparse
import os
import pytz
-from six.moves import urllib
+import urllib
import sys
import time
import traceback

MODIFY
zulip/integrations/hg/zulip_changegroup.py
zulip/integrations/hg/zulip_changegroup.py
import zulip
import sys
-from six.moves import range
from typing import Any, Optional, Text
from mercurial import ui, repository as repo

MODIFY
zulip/integrations/jabber/jabber_mirror_backend.py
zulip/integrations/jabber/jabber_mirror_backend.py
@@ -46,7 +46,7 @@ import optparse
from sleekxmpp import ClientXMPP, InvalidJID, JID
from sleekxmpp.stanza import Message as JabberMessage
from sleekxmpp.exceptions import IqError, IqTimeout
-from six.moves.configparser import SafeConfigParser
+from configparser import SafeConfigParser
import getpass
import os
import sys

MODIFY
zulip/integrations/perforce/git_p4.py
zulip/integrations/perforce/git_p4.py
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
import sys
-import six
-from six.moves import input
-from six.moves import range
-from six.moves import zip
if sys.hexversion < 0x02040000:
# The limiter is the subprocess module
sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
@@ -58,7 +54,7 @@ def p4_build_cmd(cmd):
"""
real_cmd = ["p4"]
- if isinstance(cmd, six.string_types):
+ if isinstance(cmd, str):
real_cmd = ' '.join(real_cmd) + ' ' + cmd
else:
real_cmd += cmd
@@ -97,7 +93,7 @@ def write_pipe(c, stdin):
if verbose:
sys.stderr.write('Writing pipe: %s\n' % str(c))
- expand = isinstance(c, six.string_types)
+ expand = isinstance(c, str)
p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
pipe = p.stdin
val = pipe.write(stdin)
@@ -115,7 +111,7 @@ def read_pipe(c, ignore_error=False):
if verbose:
sys.stderr.write('Reading pipe: %s\n' % str(c))
- expand = isinstance(c, six.string_types)
+ expand = isinstance(c, str)
p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
pipe = p.stdout
val = pipe.read()
@@ -132,7 +128,7 @@ def read_pipe_lines(c):
if verbose:
sys.stderr.write('Reading pipe: %s\n' % str(c))
- expand = isinstance(c, six.string_types)
+ expand = isinstance(c, str)
p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
pipe = p.stdout
val = pipe.readlines()
@@ -175,7 +171,7 @@ def p4_has_move_command():
return True
def system(cmd):
- expand = isinstance(cmd, six.string_types)
+ expand = isinstance(cmd, str)
if verbose:
sys.stderr.write("executing %s\n" % str(cmd))
retcode = subprocess.call(cmd, shell=expand)
@@ -185,7 +181,7 @@ def system(cmd):
def p4_system(cmd):
"""Specifically invoke p4 as the system command. """
real_cmd = p4_build_cmd(cmd)
- expand = isinstance(real_cmd, six.string_types)
+ expand = isinstance(real_cmd, str)
retcode = subprocess.call(real_cmd, shell=expand)
if retcode:
raise CalledProcessError(retcode, real_cmd)
@@ -362,7 +358,7 @@ def getP4OpenedType(file):
# Return the set of all p4 labels
def getP4Labels(depotPaths):
labels = set()
- if isinstance(depotPaths, six.string_types):
+ if isinstance(depotPaths, str):
depotPaths = [depotPaths]
for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
@@ -429,7 +425,7 @@ def isModeExecChanged(src_mode, dst_mode):
def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
- if isinstance(cmd, six.string_types):
+ if isinstance(cmd, str):
cmd = "-G " + cmd
expand = True
else:
@@ -446,7 +442,7 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
stdin_file = None
if stdin is not None:
stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
- if isinstance(stdin, six.string_types):
+ if isinstance(stdin, str):
stdin_file.write(stdin)
else:
for i in stdin:

MODIFY
zulip/integrations/rss/rss-bot
zulip/integrations/rss/rss-bot
import calendar
import errno
import hashlib
-from six.moves.html_parser import HTMLParser
+from html.parser import HTMLParser
import logging
import argparse
import os
import re
import sys
import time
-from six.moves import urllib
+import urllib
from typing import Dict, List, Tuple, Any
import feedparser

MODIFY
zulip/integrations/twitter/twitter-bot
zulip/integrations/twitter/twitter-bot
import os
import sys
import argparse
-from six.moves.configparser import ConfigParser, NoSectionError, NoOptionError
+from configparser import ConfigParser, NoSectionError, NoOptionError
import zulip
VERSION = "0.9"

MODIFY
zulip/integrations/zephyr/check-mirroring
zulip/integrations/zephyr/check-mirroring
@@ -9,7 +9,6 @@ import subprocess
import hashlib
import zephyr
import zulip
-from six.moves import range
if False:
from typing import Any, Dict, List, Set, Tuple

MODIFY
zulip/integrations/zephyr/zephyr_mirror_backend.py
zulip/integrations/zephyr/zephyr_mirror_backend.py
@@ -4,8 +4,6 @@ from typing import IO, Any, Dict, List, Text, Union, Set, Tuple, Optional, cast
from types import FrameType
import sys
-from six.moves import map
-from six.moves import range
import json
import re
import time

integrations: Remove usage of six.