From e40a614a5e8b0bb7f2a339b211100d42c6ac94fa Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 20 Nov 2013 10:42:33 -0500 Subject: [PATCH] update elpy to 1.2.1 --- .../elpa/{elpy-1.2.0 => elpy-1.2.1}/LICENSE | 0 .../elpa/{elpy-1.2.0 => elpy-1.2.1}/README | 0 .../elpy-autoloads.el | 6 +- .../{elpy-1.2.0 => elpy-1.2.1}/elpy-pkg.el | 2 +- .../{elpy-1.2.0 => elpy-1.2.1}/elpy-pkg.elc | Bin 777 -> 807 bytes .../elpy-refactor.el | 16 +++-- .../elpy-refactor.elc | Bin 10159 -> 10195 bytes .../elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy.el | 62 ++++++++++-------- .../elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy.elc | Bin 48367 -> 48887 bytes .../snippets/python-mode/__enter__ | 0 .../snippets/python-mode/__exit__ | 0 .../snippets/python-mode/super | 0 12 files changed, 48 insertions(+), 38 deletions(-) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/LICENSE (100%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/README (100%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy-autoloads.el (95%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy-pkg.el (93%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy-pkg.elc (72%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy-refactor.el (96%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy-refactor.elc (90%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy.el (97%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/elpy.elc (83%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/snippets/python-mode/__enter__ (100%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/snippets/python-mode/__exit__ (100%) rename emacs.d/elpa/{elpy-1.2.0 => elpy-1.2.1}/snippets/python-mode/super (100%) diff --git a/emacs.d/elpa/elpy-1.2.0/LICENSE b/emacs.d/elpa/elpy-1.2.1/LICENSE similarity index 100% rename from emacs.d/elpa/elpy-1.2.0/LICENSE rename to emacs.d/elpa/elpy-1.2.1/LICENSE diff --git a/emacs.d/elpa/elpy-1.2.0/README b/emacs.d/elpa/elpy-1.2.1/README similarity index 100% rename from emacs.d/elpa/elpy-1.2.0/README rename to emacs.d/elpa/elpy-1.2.1/README diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el b/emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el similarity index 95% rename from emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el rename to emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el index 6aa8840..af9ad2b 100644 --- a/emacs.d/elpa/elpy-1.2.0/elpy-autoloads.el +++ b/emacs.d/elpa/elpy-1.2.1/elpy-autoloads.el @@ -4,7 +4,7 @@ ;;;### (autoloads (elpy-mode elpy-disable elpy-enable) "elpy" "elpy.el" -;;;;;; (21116 61707 0 0)) +;;;;;; (21132 55281 0 0)) ;;; Generated autoloads from elpy.el (autoload 'elpy-enable "elpy" "\ @@ -39,8 +39,8 @@ more structured list. ;;;*** -;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (21116 -;;;;;; 61707 359801 0)) +;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (21132 +;;;;;; 55281 220123 0)) ;;;*** diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.el b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.el similarity index 93% rename from emacs.d/elpa/elpy-1.2.0/elpy-pkg.el rename to emacs.d/elpa/elpy-1.2.1/elpy-pkg.el index 2af894a..3aa8c12 100644 --- a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.el +++ b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.el @@ -1,4 +1,4 @@ -(define-package "elpy" "1.2.0" +(define-package "elpy" "1.2.1" "Emacs Python Development Environment" '((auto-complete "1.4") (find-file-in-project "3.2") diff --git a/emacs.d/elpa/elpy-1.2.0/elpy-pkg.elc b/emacs.d/elpa/elpy-1.2.1/elpy-pkg.elc similarity index 72% rename from emacs.d/elpa/elpy-1.2.0/elpy-pkg.elc rename to emacs.d/elpa/elpy-1.2.1/elpy-pkg.elc index 40350857e9237746b6c2600a58148839fc10183e..6921071ad242267f5a4f5d27119c82fd90cede49 100644 GIT binary patch delta 113 zcmeBVTh2B?&L$@@FFhqc&mpNOwWI{f(e+JCcFNDs)(t4i*UQOIPRvor&r=9bO;Pa6 zFHh E0HfX|x&QzG delta 83 zcmZ3^*2y+OPSqhSKc^%yvnW+BCqFqcMnxf#B zU#4JWpkQcVWny4uJkeQE0jfn`FEuwYxmYhnKQ*Ty5kyq#8tNJ88E&lo#mHzjxq@lu zp1$!`TjHkUG6Gcs8kZQjJ9!^UW``99YH7A6a$%?tUxnSk84f)|*X%#1eg7gbLKvZPuqlbPY<8ET6_ oqLZ!FLli8HOf+LPxikuj^2;()QWey}PAW=GOH3}wFVf@!0PM6k delta 216 zcmccYzutd>oT@`ueojeZW>KnMPJVJ?jzWH(f?H9hf?s}_f`WyDfu)t9p_S3ZC`Czq zz0};qGIcQ;Yz|oA>j3GXc5WLKm2sOf5Ix6;)tlGBw})U+g|7qw(hZ3iDZ*j4dZOsMazH zPyVMW&!{?CK}~{DWwNzeEt9Fm ;; URL: https://github.com/jorgenschaefer/elpy -;; Version: 1.2.0 +;; Version: 1.2.1 ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License @@ -104,7 +104,7 @@ These are prepended to `grep-find-ignored-directories'." "Hook run when `elpy-mode' is enabled." :group 'elpy) -(defconst elpy-version "1.2.0" +(defconst elpy-version "1.2.1" "The version of the Elpy lisp code.") (defun elpy-version () @@ -393,7 +393,7 @@ This should be run from `python-mode-hook'." (set (make-local-variable 'flymake-warning-predicate) "^W[0-9]") (set (make-local-variable 'flymake-warning-re) "^W[0-9]")))) -(defvar elpy-project-root 'not-initialized +(defvar elpy-project-root nil "The root of the project the current buffer is in.") (make-variable-buffer-local 'elpy-project-root) (put 'elpy-project-root 'safe-local-variable 'file-directory-p) @@ -403,28 +403,27 @@ This should be run from `python-mode-hook'." You can set the variable `elpy-project-root' in, for example, .dir-locals.el to configure this." - (when (eq elpy-project-root 'not-initialized) - (setq elpy-project-root (elpy-project--find-root))) + (when (not elpy-project-root) + (setq elpy-project-root (elpy-project--find-root)) + (when (equal (directory-file-name (expand-file-name default-directory)) + (directory-file-name (expand-file-name "~"))) + (display-warning 'elpy + (concat "Project root set to your home directory; " + "this can slow down operation considerably") + :warning))) elpy-project-root) -(defun elpy-project--find-root (&optional skip-current-directory) +(defun elpy-project--find-root () "Find the first directory in the tree not containing an __init__.py If there is no __init__.py in the current directory, return the -current directory unless SKIP-CURRENT-DIRECTORY is non-nil." - (cond - ((file-exists-p (format "%s/__init__.py" default-directory)) - (locate-dominating-file default-directory - (lambda (dir) - (not (file-exists-p - (format "%s/__init__.py" dir)))))) - ;; Don't return the user's home. That's never a good project root. - ((and (not skip-current-directory) - (not (equal (directory-file-name (expand-file-name default-directory)) - (directory-file-name (expand-file-name "~"))))) - default-directory) - (t - nil))) +current directory." + (if (file-exists-p (format "%s/__init__.py" default-directory)) + (locate-dominating-file default-directory + (lambda (dir) + (not (file-exists-p + (format "%s/__init__.py" dir))))) + default-directory)) (defun elpy-set-project-root (new-root) "Set the Elpy project root to NEW-ROOT." @@ -992,6 +991,11 @@ creating one if necessary." elpy-rpc-python-command))) elpy-rpc--buffer))) +(defun elpy-rpc--get-rpc-process () + "Return the RPC process associated with the current buffer, +creating one if necessary." + (get-buffer-process (elpy-rpc--get-rpc-buffer))) + (defun elpy-rpc--find-buffer (project-root python-command) "Return an existing RPC buffer for this project root and command." (let ((result nil)) @@ -1226,7 +1230,8 @@ Returns the result, blocking until this arrived." end-time) (not (or result-arrived error-occured))) - (accept-process-output nil elpy-rpc--timeout 10))) + (accept-process-output (elpy-rpc--get-rpc-process) + elpy-rpc--timeout))) (cond (error-occured (error error-string)) @@ -1412,13 +1417,6 @@ description." (message "%s" text))) -;;;;;;;; -;;; nose - -(eval-after-load "nose" - '(defalias 'nose-find-project-root 'elpy-project--find-root)) - - ;;;;;;;;;;;;; ;;; Yasnippet @@ -1530,6 +1528,14 @@ This uses `elpy--ac-cache'." (defun python-shell-parse-command () "Compatibility function for older Emacsen." python-python-command)) +(when (not (fboundp 'python-shell-calculate-process-environment)) + (defun python-shell-calculate-process-environment () + "Compatibility function for older Emacsen." + process-environment)) +(when (not (fboundp 'python-shell-calculate-exec-path)) + (defun python-shell-calculate-exec-path () + "Compatibility function for older Emacsen." + exec-path)) ;; Emacs 24.2 made `locate-dominating-file' accept a predicate instead ;; of a string. Simply overwrite the current one, it's diff --git a/emacs.d/elpa/elpy-1.2.0/elpy.elc b/emacs.d/elpa/elpy-1.2.1/elpy.elc similarity index 83% rename from emacs.d/elpa/elpy-1.2.0/elpy.elc rename to emacs.d/elpa/elpy-1.2.1/elpy.elc index b7fbc9a8b1dd60284e0c65e5c4ea08b7891a586f..09f7503c01f2b0c737a2e02cdf828fd8a6ca378d 100644 GIT binary patch delta 1521 zcmY*ZYiv|S6lUgbOIx0?yoos76%b^%GjnI|?&V>C$|DsTtSMF58gF+m-No(R?cG~T zjX;q2AOr&p6sUko2*w8wnP1=!_@f~bqx|q6F(yPMkwlG&ui)d{?Y6-m^EhYDYtH%3 z`RPym```G$yyXR_*pu~&E4zI+2&zPUqmxilo!ck~Z%}!YN^N zsh~^EgDp*@s?wZrd!0-nE}(c_j8QNf0hgJ)@x+V~gu` z6Ga52^vhFc8^}^ajc1Tl%ci}8IoDUGwbdY7_1TTOX->Hw+4@Lqyn%#1x!|6GZLZ&1 zd<-F>#F9>RqOT#sm?`zyCGDulshB%1ZBkCA!fwJ6^-WEqS2!h5+~jFa&5ED}yky#B z6c&r6Iiq#(mW+}ul|PhxZ=0J5;=bnvB`zY~yV8Z1Z$PmEXJ& z)v24!=ce4J0l%c`3O$0M98a?822N6)6LmExsr&3N5t4eX}m&Rk$)XSecW7H(g)S@o6y}PUm zxv47GJ<(t+r4D8Sbt>C1rI;^_;fhM&;A!&K z4G5?$J^K)rT;Iv+QrTsjf|%ufFQ5Q8P>1u(YdWtvX+F4V%$1dR1Qz%Teh) z28Yl_G$*TDFHKTI{t&iVl{HB{Up@z4R#Sp2D5*XVu0tAB|25Pk?UCBqCTVwre!mEC za7p{776RbQxaG3C)SsPEy_47$N}_;Sz$;}$rTgcqn>imcyK<3T8mysc$msW|kuqo8t<2OTC zT^;U3VaLuoVWEhi+|unQ*Fw&dYWUP2*rxjM+X6vVrMmIXZ7eK(@m&Exvi0|;=b#WX z0IDZZG152h4z4riyf~m9be~pu--toZ%RAURspt}9xW~hMB%Rjn<4Cr&c@VtqP zq;09L3nwFzQA_`GVaV78eGX$mFcqQn{XXPq99FXGLqZ&KEDi}CrO^NC6*a23 p=Fv%&@{dj^^~>Xp%D8O9%S?4~O~Z`;y}H|7sE!llv~l^a@gKcr*sA~l delta 1294 zcmZWpT})g>6lUfwbZJRTK~ylo3rJy+yE`-YAJYb0z+zk4tOZ0Db(g)+CCgsiyCukj zKW$nQEvaTw(w4NS0n=8ity6yrKKRlEH6~i?JI0u3TH;S1{0SzW-B2F%VP?*m`^}tl zzB%9h;~)IXU--4^`qo}Im5n7cPB7&T#!|AImOC>^x!WC=WlJV@3#BdW^(Sg7LqTUW zHs}QtAtyB!%T3QIG{}PF^2}6m38|GE>mHDUGSi9BHij_PZQ+z?KBSA&rIiv=`IYiH z#CZQ*ha_sN{28xaNEMBR$Pmp{M~h(*bsHo^#p1SA30tc| zv96V=jE6(h0r_A$<#?X_*siX9O1LKy>FD0Cw0A{1!u$6|`sJi2r`@!YPNw+ft#@zz zAAtW>Ue13HRY*)XxSupwQAR1GrA2FVc^NQFe@)FDGpbSo9t2;*_+d3+mvTZb^5em# zG6*#w>+1;NK7exU6u z*fk#R20F!&a9Bbb|Ge{8Of0_m$SPvulbtsa)-5srsDdyt#f@D%5mrrJz2`O}ysZ0g zAGK{=l4q}o+F}@`; zE>XkE+Y6aFNd9SW84BWU*#+p&)$9@!dF|k5K!q*h6W5TWLn}8;zFi~{s)=u3EXR^b zZSnJ=mnC>qydo-tdW+kk7Pr zCYGj$k)Ke1RAsDA=qIZYri7U zF;n@{h3~MYiP?8Hp*BO$3!>2(kEN8@P}a#PDL0moYtydh)XEKw31d>AMc?TbSC7h{8ujQ{`u diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__enter__ b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__enter__ similarity index 100% rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__enter__ rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__enter__ diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__exit__ b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__exit__ similarity index 100% rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/__exit__ rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/__exit__ diff --git a/emacs.d/elpa/elpy-1.2.0/snippets/python-mode/super b/emacs.d/elpa/elpy-1.2.1/snippets/python-mode/super similarity index 100% rename from emacs.d/elpa/elpy-1.2.0/snippets/python-mode/super rename to emacs.d/elpa/elpy-1.2.1/snippets/python-mode/super