Merge lp:~nyergler/python-mode/pdbtrack-mapping into lp:python-mode

[Andreas Roehler]

Hi Nathan,

thanks. Your code looks pretty clean. Consider merging it when the recent completion bugs being fixed.

Cheers,

Andreas

[Nathan R. Yergler (nyergler)]

Thanks, Andreas. I'm not sure what "recent completion bugs" are... is that a problem with my code or something someone else is working on?

[Andreas Roehler (a-roehler)]

Am 16.04.2012 20:08, schrieb Nathan R. Yergler:
> Thanks, Andreas. I'm not sure what "recent completion bugs" are... is that a problem with my code or something someone else is working on?

it refers to latest bug reports,

https://bugs.launchpad.net/python-mode/+bug/981991

and the like. Which should be fixed soon BTW.

sorry, not being precise obviously...

Best,

Andreas

=== modified file 'python-mode.el'
--- python-mode.el	2012-04-14 08:01:10 +0000
+++ python-mode.el	2012-04-16 17:49:18 +0000
@@ -479,6 +479,13 @@
   :group 'python-mode)
 (make-variable-buffer-local 'py-pdbtrack-do-tracking-p)
 
+(defcustom py-pdbtrack-filename-mapping nil
+  "Supports mapping file paths when opening file buffers in pdbtrack.
+When non-nil this is an alist mapping paths in the Python interpreter
+to paths in Emacs."
+  :type 'alist
+  :group 'python-mode)
+
 (defcustom py-pdbtrack-minor-mode-string " PDB"
   "*String to use in the minor mode list when pdbtrack is enabled."
   :type 'string
@@ -8069,6 +8076,20 @@
             (py-pdbtrack-overlay-arrow t)
             (pop-to-buffer origbuf t)))))))
 
+(defun py-pdbtrack-map-filename (filename)
+
+  (let
+      ((replacement-val (assoc-default
+                         filename py-pdbtrack-filename-mapping
+                         (lambda (mapkey path)
+                           (string-match
+                            (concat "^" (regexp-quote mapkey))
+                            path)))
+                        ))
+    (if (not (eq replacement-val nil))
+        (replace-match replacement-val 't 't filename)
+      filename)))
+
 (defun py-pdbtrack-get-source-buffer (block)
   "Return line number and buffer of code indicated by block's traceback text.
 
@@ -8096,6 +8117,9 @@
       (cond ((file-exists-p filename)
              (list lineno (find-file-noselect filename)))
 
+            ((file-exists-p (py-pdbtrack-map-filename filename))
+             (list lineno (find-file-noselect (py-pdbtrack-map-filename filename))))
+
             ((setq funcbuffer (py-pdbtrack-grub-for-buffer funcname lineno))
              (if (string-match "/Script (Python)$" filename)
                  ;; Add in number of lines for leading '##' comments: