Replace several uses of pylib with native Python. Refs devpi#930

client/devpi/pypirc.py

@@ -1,14 +1,15 @@
 """
 helpers for authenticating against info from .pypirc files.
 """
+import iniconfig
 import py
 
 
 class Auth:
     def __init__(self, path=None):
         if path is None:
             path = py.path.local._gethomedir().join(".pypirc")
-        self.ini = py.iniconfig.IniConfig(path)
+        self.ini = iniconfig.IniConfig(path)
 
     def get_url_auth(self, secname):
         section = self.ini[secname]

client/devpi/upload.py

@@ -1,3 +1,4 @@
+import iniconfig
 import os
 import sys
 import py
@@ -557,7 +558,7 @@ def sdistformat(format):
 def read_setupcfg(hub, path):
     setup_cfg = path.join("setup.cfg")
     if setup_cfg.exists():
-        cfg = py.iniconfig.IniConfig(setup_cfg)
+        cfg = iniconfig.IniConfig(setup_cfg)
         hub.line("detected devpi:upload section in %s" % setup_cfg, bold=True)
         return cfg.sections.get("devpi:upload", {})
     return {}

client/setup.py

@@ -30,6 +30,7 @@ def get_changelog():
         "build",
         "check-manifest>=0.28",
         "devpi_common<4,>=3.6.0",
+        "iniconfig",
         "pep517",
         "pkginfo>=1.4.2",
         "platformdirs",

client/testing/conftest.py

@@ -1,6 +1,8 @@
 from __future__ import print_function
 from contextlib import closing
 from devpi_common.metadata import parse_version
+from io import BytesIO
+from io import StringIO
 import codecs
 import os
 import pytest
@@ -17,7 +19,12 @@
 
 import subprocess
 
-print_ = py.builtin.print_
+
+# BBB for Python 2.7
+try:
+    basestring
+except NameError:
+    basestring = str
 
 
 def pytest_addoption(parser):
@@ -33,7 +40,7 @@ def pytest_addoption(parser):
 
 def print_info(*args, **kwargs):
     kwargs.setdefault("file", sys.stderr)
-    return py.builtin.print_(*args, **kwargs)
+    return print(*args, **kwargs)
 
 
 class PopenFactory:
@@ -336,7 +343,7 @@ def create_files(base, filedefs):
     for key, value in filedefs.items():
         if isinstance(value, dict):
             create_files(base.ensure(key, dir=1), value)
-        elif isinstance(value, py.builtin._basestring):
+        elif isinstance(value, basestring):
             s = textwrap.dedent(value)
             base.join(key).write(s)
 
@@ -372,7 +379,7 @@ def initproj_(nameversion, filedefs=None, src_root=".", kind="setup.py"):
             filedefs = {}
         if not src_root:
             src_root = "."
-        if isinstance(nameversion, py.builtin._basestring):
+        if isinstance(nameversion, basestring):
             parts = nameversion.split(str("-"))
             if len(parts) == 1:
                 parts.append("0.1")
@@ -494,7 +501,7 @@ def resultlog(self, name="pkg1", version=None,
         res = ReprResultLog("/%s-%s.tgz" % (name, version),
                             md5 or self.md5(),
                             **getplatforminfo())
-        out = py.io.TextIO()
+        out = StringIO()
         for i in range(passed):
             out.write(". test_pass.py::test_pass%s\n" %i)
         for i in range(failed):
@@ -577,11 +584,11 @@ def out_devpi_func(*args, **kwargs):
                 out, err = cap.reset()
                 del cap
         except:
-            print_(out)
-            print_(err)
+            print(out)
+            print(err)
             raise
-        print_(out)
-        print_(err, file=sys.stderr)
+        print(out)
+        print(err, file=sys.stderr)
         return RunResult(ret, out.split("\n"), None, time.time()-now)
     return out_devpi_func
 
@@ -702,7 +709,11 @@ class args:
         verbose = False
         settrusted = False
 
-    out = py.io.TextIO()
+    # BBB for Python 2.7
+    if sys.version_info < (3,):
+        out = BytesIO()
+    else:
+        out = StringIO()
     hub = Hub(args, file=out)
 
     def _getmatcher():

client/testing/test_functional.py

@@ -1,6 +1,5 @@
 from io import BytesIO
 import json
-import py
 import pytest
 import requests
 import tarfile
@@ -231,7 +230,6 @@ def get_mirror_whitelist(self, code=200, indexname=None):
 
     def upload_file_pypi(self, basename, content,
                          name=None, version=None):
-        assert py.builtin._isbytes(content)
         pkg = self.tmpdir.join(basename)
         pkg.write_binary(content)
         self.devpi('upload', pkg.strpath)

client/testing/test_login.py

@@ -1,8 +1,9 @@
 from devpi.main import Hub, hookimpl
 from devpi.login import main
 from functools import partial
-import py
+from io import BytesIO, StringIO
 import pytest
+import sys
 
 
 class GetPassException(Exception):
@@ -24,7 +25,11 @@ class args:
 
 @pytest.fixture
 def hub(args):
-    out = py.io.TextIO()
+    # BBB for Python 2.7
+    if sys.version_info < (3,):
+        out = BytesIO()
+    else:
+        out = StringIO()
     hub = Hub(args, file=out)
     hub._out = out
     return hub

client/testing/test_push.py

@@ -237,6 +237,9 @@ def test_derive_token_invalid_token(prefix):
     msgs = []
 
     class MockHub:
+        def info(self, msg):
+            msgs.append(msg)
+
         def warn(self, msg):
             msgs.append(msg)
     hub = MockHub()

common/devpi_common/archive.py

@@ -1,6 +1,7 @@
 """
 remotely based on some code from https://pypi.org/project/Archive/0.3/
 """
+from io import BytesIO
 import os
 import tarfile
 import zipfile
@@ -131,7 +132,7 @@ def extract(self, to_path='', safe=False):
 
 def zip_dir(basedir, dest=None):
     if dest is None:
-        f = py.io.BytesIO()
+        f = BytesIO()
     else:
         f = open(str(dest), "wb")
     zip = zipfile.ZipFile(f, "w")
@@ -156,13 +157,20 @@ def _writezip(zip, basedir):
 
 
 def zip_dict(contentdict):
-    f = py.io.BytesIO()
+    f = BytesIO()
     zip = zipfile.ZipFile(f, "w")
     _writezip_fromdict(zip, contentdict)
     zip.close()
     return f.getvalue()
 
 
+# BBB for Python 2.7
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
 def _writezip_fromdict(zip, contentdict, prefixes=()):
     for name, val in contentdict.items():
         if isinstance(val, dict):
@@ -175,6 +183,6 @@ def _writezip_fromdict(zip, contentdict, prefixes=()):
                 _writezip_fromdict(zip, val, newprefixes)
         else:
             path = os.sep.join(prefixes + (name,))
-            if py.builtin._istext(val):
+            if isinstance(val, unicode):
                 val = val.encode("ascii")
             zip.writestr(path, val)

common/devpi_common/metadata.py

@@ -1,6 +1,5 @@
 import posixpath
 import re
-import py
 from packaging.version import parse as parse_version
 from packaging.requirements import Requirement as BaseRequirement
 from .types import CompareMixin
@@ -151,13 +150,20 @@ def is_prerelease(self):
         return False
 
 
+# BBB for Python 2.7
+try:
+    basestring
+except NameError:
+    basestring = str
+
+
 class BasenameMeta(CompareMixin):
     def __init__(self, obj, sameproject=False):
         self.obj = obj
         # none of the below should be done lazily, as devpi_server.mirror
         # essentially uses this to validate parsed links
         basename = getattr(obj, "basename", obj)
-        if not isinstance(basename, py.builtin._basestring):
+        if not isinstance(basename, basestring):
             raise ValueError("need object with basename attribute")
         assert "/" not in basename, (obj, basename)
         name, version, ext = splitbasename(basename, checkarch=False)

common/devpi_common/types.py

@@ -3,7 +3,6 @@
 from types import FunctionType
 import hashlib
 import operator
-import py
 
 
 # re-introduced for 2.0 series but not used anymore
@@ -134,10 +133,23 @@ def discover_and_call(self, obj, dec):
             assert newfunc == func
 
 
+# BBB for Python 2.7
+try:
+    basestring
+except NameError:
+    basestring = str
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
 def ensure_unicode(x):
-    if py.builtin._istext(x):
+    if isinstance(x, unicode):
         return x
-    return py.builtin._totext(x, "utf8")
+    if not isinstance(x, basestring):
+        return unicode(x)
+    return x.decode("utf8")
 
 
 def parse_hash_spec(fragment):

common/testing/test_archive.py

@@ -2,6 +2,7 @@
 from devpi_common.archive import UnsupportedArchive
 from devpi_common.archive import zip_dict
 from devpi_common.archive import zip_dir
+from io import BytesIO
 from subprocess import Popen, PIPE
 import py
 import pytest
@@ -74,7 +75,7 @@ def test_namelist(self, archive):
 
     def test_unknown_archive(self):
         with pytest.raises(UnsupportedArchive):
-            Archive(py.io.BytesIO(b"123"))
+            Archive(BytesIO(b"123"))
 
     def test_read(self, archive):
         assert archive.read("1") == b"file1"
@@ -109,7 +110,7 @@ def test_tarfile_outofbound(tmpdir):
 
 def test_zip_dict(tmpdir):
     content = zip_dict({"one": {"nested": "1"}, "two": {}})
-    with Archive(py.io.BytesIO(content)) as archive:
+    with Archive(BytesIO(content)) as archive:
         archive.extract(tmpdir)
     assert tmpdir.join("one", "nested").read() == "1"
     assert tmpdir.join("two").isdir()
@@ -128,7 +129,7 @@ def test_zip_dir(tmpdir):
     assert newdest.join("sub", "subfile").isfile()
 
     newdest.remove()
-    with Archive(py.io.BytesIO(zip_dir(source))) as archive:
+    with Archive(BytesIO(zip_dir(source))) as archive:
         archive.extract(newdest)
     assert newdest.join("file").isfile()
     assert newdest.join("sub", "subfile").isfile()

server/devpi_server/auth.py

@@ -1,7 +1,6 @@
 import base64
 import hashlib
 import itsdangerous
-import py
 import secrets
 from .log import threadlog
 from passlib.context import CryptContext
@@ -132,7 +131,7 @@ def new_proxy_auth(self, username, password, request=None):
                 username,
                 result.get("groups", []),
                 result.get("from_user_object", False)])
-            assert py.builtin._totext(pseudopass, 'ascii')
+            assert pseudopass.encode('ascii')
             return {"password": pseudopass,
                     "expiration": self.LOGIN_EXPIRATION}
 
@@ -141,11 +140,11 @@ def getpwhash(password, salt):
     hash = hashlib.sha256()
     hash.update(salt.encode("ascii"))
     hash.update(password.encode("utf-8"))
-    return py.builtin._totext(hash.hexdigest())
+    return hash.hexdigest()
 
 
 def newsalt():
-    return py.builtin._totext(base64.b64encode(secrets.token_bytes(16)), "ascii")
+    return base64.b64encode(secrets.token_bytes(16)).decode("ascii")
 
 
 class DevpiHandler(MinimalHandler):
@@ -186,10 +185,9 @@ def verify_and_update_password_hash(password, hash, salt=None):
     if salt is not None:
         hash = "%s:%s" % (salt, hash)
     (valid, newhash) = pwd_context.verify_and_update(password, hash)
-    if newhash:
-        newhash = py.builtin._totext(newhash)
+    assert newhash is None or isinstance(newhash, str)
     return (valid, newhash)
 
 
 def hash_password(password):
-    return py.builtin._totext(pwd_context.hash(password))
+    return pwd_context.hash(password)

server/devpi_server/filestore.py

@@ -6,7 +6,6 @@
 import hashlib
 import mimetypes
 from wsgiref.handlers import format_date_time
-import py
 import re
 from devpi_common.metadata import splitbasename
 from devpi_common.types import parse_hash_spec
@@ -87,8 +86,8 @@ def key_from_link(keyfs, link, user, index):
 
 
 def unicode_if_bytes(val):
-    if isinstance(val, py.builtin.bytes):
-        val = py.builtin._totext(val)
+    if isinstance(val, bytes):
+        return val.decode('ascii')
     return val