Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5904a35

Browse files
committed
refactor: remove six dependency
1 parentd2a8f67 commit5904a35

File tree

11 files changed

+24
-33
lines changed

11 files changed

+24
-33
lines changed

‎README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Requirements
3232
python-gitlab depends on:
3333

3434
* `python-requests<http://docs.python-requests.org/en/latest/>`_
35-
* `six<https://six.readthedocs.io/>`_
3635

3736
Install with pip
3837
----------------

‎docs/ext/docstrings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
importos
44

55
importjinja2
6-
importsix
76
importsphinx
87
importsphinx.ext.napoleonasnapoleon
98
fromsphinx.ext.napoleon.docstringimportGoogleDocstring
@@ -25,7 +24,7 @@ def setup(app):
2524

2625
conf=napoleon.Config._config_values
2726

28-
forname, (default,rebuild)insix.iteritems(conf):
27+
forname, (default,rebuild)inconf.items():
2928
app.add_config_value(name,default,rebuild)
3029
return {"version":sphinx.__display_version__,"parallel_read_safe":True}
3130

‎gitlab/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
importwarnings
2424

2525
importrequests
26-
importsix
2726

2827
importgitlab.config
2928
fromgitlab.constimport*# noqa
@@ -47,8 +46,8 @@
4746

4847
def_sanitize(value):
4948
ifisinstance(value,dict):
50-
returndict((k,_sanitize(v))fork,vinsix.iteritems(value))
51-
ifisinstance(value,six.string_types):
49+
returndict((k,_sanitize(v))fork,vinvalue.items())
50+
ifisinstance(value,str):
5251
returnvalue.replace("/","%2F")
5352
returnvalue
5453

‎gitlab/config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
importos
19-
20-
fromsix.movesimportconfigparser
19+
importconfigparser
2120

2221
_DEFAULT_FILES= ["/etc/python-gitlab.cfg",os.path.expanduser("~/.python-gitlab.cfg")]
2322

‎gitlab/tests/test_cli.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
importos
2121
importtempfile
2222
importunittest
23+
importio
2324

2425
try:
2526
fromcontextlibimportredirect_stderr# noqa: H302
@@ -34,8 +35,6 @@ def redirect_stderr(new_target):
3435
sys.stderr=old_target
3536

3637

37-
importsix
38-
3938
fromgitlabimportcli
4039
importgitlab.v4.cli
4140

@@ -56,7 +55,7 @@ class TestClass(object):
5655
self.assertEqual("class",cli.cls_to_what(Class))
5756

5857
deftest_die(self):
59-
fl=six.StringIO()
58+
fl=io.StringIO()
6059
withredirect_stderr(fl):
6160
withself.assertRaises(SystemExit)astest:
6261
cli.die("foobar")
@@ -83,7 +82,7 @@ def test_parse_value(self):
8382
self.assertEqual(ret,"content")
8483
os.unlink(temp_path)
8584

86-
fl=six.StringIO()
85+
fl=io.StringIO()
8786
withredirect_stderr(fl):
8887
withself.assertRaises(SystemExit)asexc:
8988
cli._parse_value("@/thisfileprobablydoesntexist")

‎gitlab/tests/test_config.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
importunittest
1919

2020
importmock
21-
importsix
21+
importio
2222

2323
fromgitlabimportconfig
2424

@@ -80,26 +80,26 @@ def test_missing_config(self, path_exists):
8080
config.GitlabConfigParser("test")
8181

8282
@mock.patch("os.path.exists")
83-
@mock.patch("six.moves.builtins.open")
83+
@mock.patch("builtins.open")
8484
deftest_invalid_id(self,m_open,path_exists):
85-
fd=six.StringIO(no_default_config)
85+
fd=io.StringIO(no_default_config)
8686
fd.close=mock.Mock(return_value=None)
8787
m_open.return_value=fd
8888
path_exists.return_value=True
8989
config.GitlabConfigParser("there")
9090
self.assertRaises(config.GitlabIDError,config.GitlabConfigParser)
9191

92-
fd=six.StringIO(valid_config)
92+
fd=io.StringIO(valid_config)
9393
fd.close=mock.Mock(return_value=None)
9494
m_open.return_value=fd
9595
self.assertRaises(
9696
config.GitlabDataError,config.GitlabConfigParser,gitlab_id="not_there"
9797
)
9898

9999
@mock.patch("os.path.exists")
100-
@mock.patch("six.moves.builtins.open")
100+
@mock.patch("builtins.open")
101101
deftest_invalid_data(self,m_open,path_exists):
102-
fd=six.StringIO(missing_attr_config)
102+
fd=io.StringIO(missing_attr_config)
103103
fd.close=mock.Mock(return_value=None,side_effect=lambda:fd.seek(0))
104104
m_open.return_value=fd
105105
path_exists.return_value=True
@@ -117,9 +117,9 @@ def test_invalid_data(self, m_open, path_exists):
117117
self.assertEqual("Unsupported per_page number: 200",emgr.exception.args[0])
118118

119119
@mock.patch("os.path.exists")
120-
@mock.patch("six.moves.builtins.open")
120+
@mock.patch("builtins.open")
121121
deftest_valid_data(self,m_open,path_exists):
122-
fd=six.StringIO(valid_config)
122+
fd=io.StringIO(valid_config)
123123
fd.close=mock.Mock(return_value=None)
124124
m_open.return_value=fd
125125
path_exists.return_value=True
@@ -133,7 +133,7 @@ def test_valid_data(self, m_open, path_exists):
133133
self.assertEqual(True,cp.ssl_verify)
134134
self.assertIsNone(cp.per_page)
135135

136-
fd=six.StringIO(valid_config)
136+
fd=io.StringIO(valid_config)
137137
fd.close=mock.Mock(return_value=None)
138138
m_open.return_value=fd
139139
cp=config.GitlabConfigParser(gitlab_id="two")
@@ -144,7 +144,7 @@ def test_valid_data(self, m_open, path_exists):
144144
self.assertEqual(10,cp.timeout)
145145
self.assertEqual(False,cp.ssl_verify)
146146

147-
fd=six.StringIO(valid_config)
147+
fd=io.StringIO(valid_config)
148148
fd.close=mock.Mock(return_value=None)
149149
m_open.return_value=fd
150150
cp=config.GitlabConfigParser(gitlab_id="three")
@@ -156,7 +156,7 @@ def test_valid_data(self, m_open, path_exists):
156156
self.assertEqual("/path/to/CA/bundle.crt",cp.ssl_verify)
157157
self.assertEqual(50,cp.per_page)
158158

159-
fd=six.StringIO(valid_config)
159+
fd=io.StringIO(valid_config)
160160
fd.close=mock.Mock(return_value=None)
161161
m_open.return_value=fd
162162
cp=config.GitlabConfigParser(gitlab_id="four")

‎gitlab/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
# You should have received a copy of the GNU Lesser General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
importsix
19-
18+
fromurllib.parseimporturlparse
2019

2120
class_StdoutStream(object):
2221
def__call__(self,chunk):
@@ -52,6 +51,6 @@ def clean_str_id(id):
5251

5352

5453
defsanitized_url(url):
55-
parsed=six.moves.urllib.parse.urlparse(url)
54+
parsed=urlparse(url)
5655
new_path=parsed.path.replace(".","%2E")
5756
returnparsed._replace(path=new_path).geturl()

‎gitlab/v4/cli.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
importoperator
2222
importsys
2323

24-
importsix
25-
2624
importgitlab
2725
importgitlab.base
2826
fromgitlabimportcli
@@ -321,7 +319,7 @@ def extend_parser(parser):
321319

322320

323321
defget_dict(obj,fields):
324-
ifisinstance(obj,six.string_types):
322+
ifisinstance(obj,str):
325323
returnobj
326324

327325
iffields:
@@ -441,7 +439,7 @@ def run(gl, what, action, args, verbose, output, fields):
441439
printer.display_list(data,fields,verbose=verbose)
442440
elifisinstance(data,gitlab.base.RESTObject):
443441
printer.display(get_dict(data,fields),verbose=verbose,obj=data)
444-
elifisinstance(data,six.string_types):
442+
elifisinstance(data,str):
445443
print(data)
446444
elifhasattr(data,"decode"):
447445
print(data.decode())

‎requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
requests>=2.22.0
2-
six

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def get_version():
2525
license="LGPLv3",
2626
url="https://github.com/python-gitlab/python-gitlab",
2727
packages=find_packages(),
28-
install_requires=["requests>=2.22.0","six"],
28+
install_requires=["requests>=2.22.0"],
2929
entry_points={"console_scripts": ["gitlab = gitlab.cli:main"]},
3030
classifiers=[
3131
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp