Clean up old Python config and switch to elpy

lang-python.el

@@ -1,118 +1,2 @@
-;;pysmell
-;; (add-hook 'python-mode-hook (lambda () (pysmell-mode 1)))
-
-(add-to-list 'load-path "~/emacs/langmode/python/pinard-Pymacs-016b0bc")
-(autoload 'pymacs-apply "pymacs")
-(autoload 'pymacs-call "pymacs")
-(autoload 'pymacs-eval "pymacs" nil t)
-(autoload 'pymacs-exec "pymacs" nil t)
-(autoload 'pymacs-load "pymacs" nil t)
-(eval-after-load "pymacs"
-  '(add-to-list 'pymacs-load-path "~/emacs/langmode/python/pinard-Pymacs-016b0bc"))
-
-(require 'pymacs)
-(pymacs-load "ropemacs" "rope-")
-(setq ropemacs-enable-autoimport t)
-
-;; Python mode
-(setq load-path (cons "~/emacs/langmode/python" load-path))
-(load "django-html-mode.el")
-(autoload 'python-mode "python-mode" "Python Mode." t)
-
-(autoload 'python-mode "python-mode.el" "Python mode." t)
-(setq auto-mode-alist (append '(("/*.\.py$" . python-mode)) auto-mode-alist))
-(add-to-list 'interpreter-mode-alist '("python" . python-mode))
-(require 'python-mode)
-
-(defun load-ropemacs ()
-  "Load pymacs and ropemacs"
-  (interactive)
-  (setenv "PYMACS_PYTHON" "python")
-  (setenv "PYTHONPATH" "~/emacs/langmode/python/ropemacs")
-  (require 'pymacs)
-  ;; (global-set-key [(meta ?/)] 'rope-code-assist)
-  (setq rope-confirm-saving 'nil)
-  )
-
-(add-hook 'python-mode-hook 'load-ropemacs)
-
-(add-hook 'python-mode-hook
-           (lambda ()
-             (set-variable 'py-indent-offset 4)
-             (set-variable 'indent-tabs-mode nil)
-             ;; (smart-operator-mode-on)
-))
-
-;; Copied from http://hide1713.wordpress.com/2009/01/30/setup-perfect-python-environment-in-emacs/
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Auto-completion
-;;;  Integrates:
-;;;   1) Rope
-;;;   2) Yasnippet
-;;;   all with AutoComplete.el
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun prefix-list-elements (list prefix)
-  (let (value)
-    (nreverse
-     (dolist (element list value)
-      (setq value (cons (format "%s%s" prefix element) value))))))
-(defvar ac-source-rope
-  '((candidates
-     . (lambda ()
-         (prefix-list-elements (rope-completions) ac-target))))
-  "Source for Rope")
-(defun ac-python-find ()
-  "Python `ac-find-function'."
-  (require 'thingatpt)
-  (let ((symbol (car-safe (bounds-of-thing-at-point 'symbol))))
-    (if (null symbol)
-        (if (string= "." (buffer-substring (- (point) 1) (point)))
-            (point)
-          nil)
-      symbol)))
-(defun ac-python-candidate ()
-  "Python `ac-candidates-function'"
-  (let (candidates)
-    (dolist (source ac-sources)
-      (if (symbolp source)
-          (setq source (symbol-value source)))
-      (let* ((ac-limit (or (cdr-safe (assq 'limit source)) ac-limit))
-             (requires (cdr-safe (assq 'requires source)))
-             cand)
-        (if (or (null requires)
-                (>= (length ac-target) requires))
-            (setq cand
-                  (delq nil
-                        (mapcar (lambda (candidate)
-                                  (propertize candidate 'source source))
-                                (funcall (cdr (assq 'candidates source)))))))
-        (if (and (> ac-limit 1)
-                 (> (length cand) ac-limit))
-            (setcdr (nthcdr (1- ac-limit) cand) nil))
-        (setq candidates (append candidates cand))))
-    (delete-dups candidates)))
-(add-hook 'python-mode-hook
-          (lambda ()
-                 (auto-complete-mode 1)
-                 (set (make-local-variable 'ac-sources)
-                      (append ac-sources '(ac-source-rope) ))
-                 (set (make-local-variable 'ac-find-function) 'ac-python-find)
-                 (set (make-local-variable 'ac-candidate-function) 'ac-python-candidate)
-                 (set (make-local-variable 'ac-auto-start) nil)))
-;;Ryan's python specific tab completion
-(defun ryan-python-tab ()
-  ; Try the following:
-  ; 1) Do a yasnippet expansion
-  ; 2) Do a Rope code completion
-  ; 3) Do an indent
-  (interactive)
-  (if (eql (ac-start) 0)
-      (indent-for-tab-command)))
-(defadvice ac-start (before advice-turn-on-auto-start activate)
-  (set (make-local-variable 'ac-auto-start) t))
-(defadvice ac-cleanup (after advice-turn-off-auto-start activate)
-  (set (make-local-variable 'ac-auto-start) nil))
-(define-key py-mode-map "\t" 'ryan-python-tab)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; End Auto Completion
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(elpy-enable)
+(setq elpy-rpc-backend "jedi")

sys-common.el

@@ -41,8 +41,6 @@
   (message "Console"))
  (t (load "gui-settings.el")))
 
-(semantic-stickyfunc-mode -1)
-
 ;; Ask before quitting
 (defun ask-before-closing ()
   "Ask whether or not to close, and then close if y was pressed"

sys-linux.el

@@ -25,9 +25,7 @@
         org
         org-plus-contrib
         rtags
-        ycmd
-        company-ycmd
-        flycheck-ycmd
+        elpy
         ))
 
 (dolist (package package-list)
@@ -48,7 +46,7 @@
 
 (setq popup-terminal-command '("gnome-terminal"))
 
-;; (load "lang-python.el")
+(load "lang-python.el")
 
 ;; (load "misc-gnus.el")
 (load "misc-doxygen.el")
@@ -81,10 +79,3 @@
   ((not (boundp 'initial-window-system))
    (message "Console"))
   (t (load "gui-settings.el")))
-
-(custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
-  '(semantic-decoration-on-private-members-face ((((class color) (background dark)) (:background "#2e3330")))))