Skip to content

Commit 0ced8e8

Browse files
committed
Eliminate six dependency
Less dependencies we have, less effort we need to keep RPM / Deb package dependencies and building intructions for various OSes up to date. It was mostly removed in [1]: this commit removed the last occurence and drops the dependency. [1]: #263
1 parent 83867b7 commit 0ced8e8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

lib/server_mixins.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import os
22
import glob
33
import shlex
4-
from six.moves import shlex_quote
4+
5+
try:
6+
# Python 3.3+.
7+
from shlex import quote as shlex_quote
8+
except ImportError:
9+
# Python 2.7.
10+
from pipes import quote as shlex_quote
511

612
from lib.utils import find_in_path
713
from lib.utils import print_tail_n

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ PyYAML==5.1
22
argparse==1.1
33
msgpack-python==0.4.6
44
gevent==21.1.2
5-
six>=1.8.0

0 commit comments

Comments
 (0)