Skip to content

ref: replace usage of deprecated imp #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianmay merged 10 commits into from
Jun 10, 2020
+9 −37
Merged

ref: replace usage of deprecated imp #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff45dd8
Use types instead of imp.new_module.
Jun 3, 2020
04f2135
Merge remote-tracking branch 'upstream/master' into ref/replace-depre…
Jun 3, 2020
1f25570
use source loader from importlib
Jun 3, 2020
1578567
Revert "use source loader from importlib"
Jun 3, 2020
bb52328
use inspect.getsource, but alas
Jun 3, 2020
e5d10c5
placate linter
Jun 3, 2020
087d07a
use find_spec to resolve a module spec to a file path
Jun 9, 2020
bb99f0a
better function naming
Jun 9, 2020
9694ddb
remove outdated comment
Jun 9, 2020
7eccd8f
Merge remote-tracking branch 'upstream/master' into ref/replace-depre…
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sshuttle/assembler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sys
import zlib
import imp
import types

verbosity = verbosity # noqa: F821 must be a previously defined global
z = zlib.decompressobj()
Expand All @@ -15,7 +15,7 @@
% (name, nbytes))
content = z.decompress(sys.stdin.read(nbytes))

module = imp.new_module(name)
module = types.ModuleType(name)
parents = name.rsplit(".", 1)
if len(parents) == 2:
parent, parent_name = parents
Expand Down
42 changes: 7 additions & 35 deletions sshuttle/ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re
import socket
import zlib
import imp
import importlib
import subprocess as ssubprocess
import shlex
from shlex import quote
Expand All @@ -14,43 +14,15 @@
from sshuttle.helpers import debug2


def readfile(name):
tokens = name.split(".")
f = None

token = tokens[0]
token_name = [token]
token_str = ".".join(token_name)

try:
f, pathname, description = imp.find_module(token_str)

for token in tokens[1:]:
module = imp.load_module(token_str, f, pathname, description)
if f is not None:
f.close()

token_name.append(token)
token_str = ".".join(token_name)

f, pathname, description = imp.find_module(
token, module.__path__)

if f is not None:
contents = f.read()
else:
contents = ""

finally:
if f is not None:
f.close()

return contents.encode("UTF8")
def get_module_source(name):
spec = importlib.util.find_spec(name)
with open(spec.origin, "rt") as f:
return f.read().encode("utf-8")


def empackage(z, name, data=None):
if not data:
data = readfile(name)
data = get_module_source(name)
content = z.compress(data)
content += z.flush(zlib.Z_SYNC_FLUSH)

Expand Down Expand Up @@ -117,7 +89,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
rhost = host

z = zlib.compressobj(1)
content = readfile('sshuttle.assembler')
content = get_module_source('sshuttle.assembler')
optdata = ''.join("%s=%r\n" % (k, v) for (k, v) in list(options.items()))
optdata = optdata.encode("UTF8")
content2 = (empackage(z, 'sshuttle') +
Expand Down