Skip to content

Commit

Permalink
Cleanup PexInfo and PythonInterpreter. (#581)
Browse files Browse the repository at this point in the history
Kill an unused type in `PexInfo` as well as our last remaining use of
`pkg_resources.get_platform`. Also kill unused `COMPATIBLE_SETUPTOOLS`
constants in `PythonInterpreter`.
  • Loading branch information
jsirois authored Oct 8, 2018
1 parent b9229d7 commit 55e6482
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
8 changes: 0 additions & 8 deletions pex/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,6 @@ class PythonInterpreter(object):

CACHE = {} # memoize executable => PythonInterpreter

try:
# Versions of distribute prior to the setuptools merge would automatically replace
# 'setuptools' requirements with 'distribute'. It provided the 'replacement' kwarg
# to toggle this, but it was removed post-merge.
COMPATIBLE_SETUPTOOLS = Requirement.parse('setuptools>=1.0', replacement=False)
except TypeError:
COMPATIBLE_SETUPTOOLS = Requirement.parse('setuptools>=1.0')

class Error(Exception): pass
class IdentificationError(Error): pass
class InterpreterNotFound(Error): pass
Expand Down
9 changes: 4 additions & 5 deletions pex/pex_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import json
import os
import warnings
from collections import namedtuple

from .common import open_zip
from .compatibility import PY2
Expand All @@ -15,8 +14,6 @@
from .util import merge_split
from .variables import ENV

PexPlatform = namedtuple('PexPlatform', 'interpreter version strict')


# TODO(wickman) Split this into a PexInfoBuilder/PexInfo to ensure immutability.
# Issue #92.
Expand Down Expand Up @@ -53,13 +50,15 @@ class PexInfo(object):
@classmethod
def make_build_properties(cls, interpreter=None):
from .interpreter import PythonInterpreter
from pkg_resources import get_platform
from .platforms import Platform

pi = interpreter or PythonInterpreter.get()
plat = Platform.current()
platform_name = plat.platform
return {
'class': pi.identity.interpreter,
'version': pi.identity.version,
'platform': get_platform(),
'platform': platform_name,
}

@classmethod
Expand Down

0 comments on commit 55e6482

Please sign in to comment.