Skip to content

Commit

Permalink
Merge pull request #44 from twisted/imp-and-set
Browse files Browse the repository at this point in the history
combine #41 and #43 since I am not getting an 'update branch' button
  • Loading branch information
glyph authored Oct 16, 2024
2 parents 68e93a4 + cead08a commit fac5c73
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 deletions ampoule/main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import sys
import imp
import importlib.util
import itertools

from zope.interface import implementer
Expand All @@ -10,7 +10,6 @@
from twisted.python import reflect
from twisted.protocols import amp
from twisted.python import runtime
from twisted.python.compat import set

from ampoule import iampoule

Expand Down Expand Up @@ -285,7 +284,7 @@ def spawnProcess(processProtocol, bootstrap, args=(), env={},

pythonpath = []
for pkg in packages:
p = os.path.split(imp.find_module(pkg)[1])[0]
p = os.path.split(importlib.util.find_spec(pkg).origin)[0]
if p.startswith(os.path.join(sys.prefix, 'lib')):
continue
pythonpath.append(p)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Topic :: System',
Expand Down

0 comments on commit fac5c73

Please sign in to comment.