Install as pdbpp.py (#318)

pdbpp · Nov 8, 2019 · f95703d · f95703d
1 parent 37ee002
commit f95703d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -55,7 +55,7 @@ def run(self):
     use_scm_version=True,
     author='Antonio Cuni',
     author_email='anto.cuni@gmail.com',
-    py_modules=['pdb', '_pdbpp_path_hack.pdb'],
+    py_modules=['pdbpp', '_pdbpp_path_hack.pdb'],
     package_dir={"": "src"},
     url='http://github.com/antocuni/pdb',
     license='BSD',

diff --git a/src/_pdbpp_path_hack/pdb.py b/src/_pdbpp_path_hack/pdb.py
@@ -1,8 +1,9 @@
 # this file is needed to hijack pdb without eggs
 import os
+import sys
 
 if int(os.environ.get('PDBPP_HIJACK_PDB', 1)):
-    pdb_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'pdb.py')
+    pdb_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'pdbpp.py')
 else:
     # Use original pdb.
     import code  # arbitrary module which stays in the same dir as pdb
@@ -15,3 +16,8 @@
 
 with open(pdb_path) as f:
     exec(compile(f.read(), pdb_path, 'exec'))
+
+# Update/set __file__ attribute to actually sourced file, but not when not coming
+# here via "-m pdb", where __name__ is "__main__".
+if __name__ != "__main__":
+    sys.modules["pdb"].__file__ = pdb_path
diff --git a/src/pdb.py → src/pdbpp.py b/src/pdb.py → src/pdbpp.py
diff --git a/testing/test_pdb.py b/testing/test_pdb.py
@@ -3563,11 +3563,23 @@ def test_python_m_pdb_usage():
 @pytest.mark.parametrize('PDBPP_HIJACK_PDB', (1, 0))
 def test_python_m_pdb_uses_pdbpp_and_env(PDBPP_HIJACK_PDB, monkeypatch, tmphome):
     import subprocess
+    import textwrap
 
     monkeypatch.setenv("PDBPP_HIJACK_PDB", str(PDBPP_HIJACK_PDB))
 
     f = tmphome.ensure("test.py")
-    f.write("import os\n__import__('pdb').set_trace()")
+    f.write(textwrap.dedent("""
+        import inspect
+        import os
+        import pdb
+
+        fname = os.path.basename(inspect.getfile(pdb.Pdb))
+        if {PDBPP_HIJACK_PDB}:
+            assert fname == 'pdbpp.py', (fname, pdb, pdb.Pdb)
+        else:
+            assert fname == 'pdb.py', (fname, pdb, pdb.Pdb)
+        pdb.set_trace()
+    """.format(PDBPP_HIJACK_PDB=PDBPP_HIJACK_PDB)))
 
     p = subprocess.Popen(
         [sys.executable, "-m", "pdb", str(f)],