Merge branch 'release/0.7.5b'

klen · klen · commit 4adc34eac4c4 · 2013-12-03T21:48:44.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 Gemfile.lock
 VimFlavor.lock
 _
+build
 tags
 test.py
 todo.txt
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-02 0.7.4b
+## 2013-12-02 0.7.5b
 --------------------
     * Update indentation support;
     * Python3 support;
diff --git a/Makefile b/Makefile
@@ -4,7 +4,9 @@ PYLAMA = $(LIBS)/pylama
 
 .PHONY: clean
 clean:
-	find . -name "*.pyc" -delete
+	find $(CURDIR) -name "*.pyc" -delete
+	rm -rf $(CURDIR)/build
+	rm -rf *.deb
 
 # Temporary disable rope tests on Travis
 .PHONY: travis
@@ -29,3 +31,37 @@ $(PYLAMA):
 
 $(PYLAMA)/lint/pylama_pylint:
 	cp -r ~/Dropbox/projects/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
+
+$(CURDIR)/build:
+	mkdir -p $(CURDIR)/build/usr/share/vim/addons
+	mkdir -p $(CURDIR)/build/usr/share/vim/registry
+	cp -r after autoload doc ftplugin plugin pymode syntax $(CURDIR)/build/usr/share/vim/addons/.
+	cp -r python-mode.yaml $(CURDIR)/build/usr/share/vim/registry/.
+
+TARGET?=$(CURDIR)/deb
+PACKAGE_VERSION?=$(shell git describe --tags `git rev-list master --tags --max-count=1`) 
+PACKAGE_NAME="vim-python-mode"
+PACKAGE_MAINTAINER="Kirill Klenov <horneds@gmail.com>"
+PACKAGE_URL=http://github.com/klen/python-mode
+deb: clean $(CURDIR)/build
+	@git co gh-pages
+	@fpm -s dir -t deb -a all \
+	    -n $(PACKAGE_NAME) \
+	    -v $(PACKAGE_VERSION) \
+	    -m $(PACKAGE_MAINTAINER) \
+	    --url $(PACKAGE_URL) \
+	    --license "GNU lesser general public license" \
+	    --description "Vim-Swissknife for python" \
+	    --deb-user root \
+	    --deb-group root \
+	    -C $(CURDIR)/build \
+	    -d "python2.7" \
+	    -d "vim-addon-manager" \
+	    usr
+	@mkdir -p $(TARGET)
+	@prm --type deb --path $(TARGET) \
+	    --release precise,quantal,raring,saucy \
+	    --arch amd64,i386,all \
+	    --component main \
+	    --directory $(CURDIR) \
+	    --gpg horneds@gmail.com
diff --git a/README.rst b/README.rst
@@ -95,6 +95,28 @@ Then rebuild **helptags** in vim::
    must be enabled to use python-mode.
 
 
+Debian packages
+---------------
+
+Repository URL: http://klen.github.io/python-mode/deb/
+Install with commands:
+
+::
+
+     add-apt-repository http://klen.github.io/python-mode/deb main
+     apt-get update
+     apt-get install vim-python-mode
+
+If you are getting the message: "The following signatures couldn' be verified because the public key is not available": ::
+
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B5DF65307000E266
+
+`vim-python-mode` using `vim-addons`, so after installation just enable
+`python-mode` with command: ::
+
+    vim-addons install python-mode
+
+
 Troubleshooting
 ===============
 
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.7.4b
+                          Version: 0.7.5b
 
 ==============================================================================
 CONTENTS                                                       *pymode-contents*
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,5 +1,5 @@
 " vi: fdl=1 
-let g:pymode_version = "0.7.4b"
+let g:pymode_version = "0.7.5b"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
diff --git a/pylama.ini b/pylama.ini
@@ -0,0 +1,2 @@
+[main]
+ignore = R0201,R0922,C0111,E1103
diff --git a/pylint.ini b/pylint.ini
diff --git a/pymode/run.py b/pymode/run.py
@@ -33,7 +33,7 @@ def run_code():
             # A false code will be treated as a
             # successful run, and the error will be hidden from Vim
             env.error("Script exited with code %s" % e.code)
-            env.stop()
+            return env.stop()
 
     except Exception:
         import traceback
@@ -43,13 +43,9 @@ def run_code():
         err = sys.stderr.getvalue()
 
     output = sys.stdout.getvalue().strip()
+    output = env.prepare_value(output)
     sys.stdout, sys.stderr = stdout_, stderr_
 
-    try:
-        output = output.decode('utf-8').encode(env.options.get('encoding'))
-    except AttributeError:
-        pass
-
     errors += [er for er in err.splitlines() if er and "<string>" not in er]
 
     env.let('l:traceback', errors[2:])
diff --git a/pymode/utils.py b/pymode/utils.py
@@ -1,5 +1,4 @@
 """ Pymode utils. """
-import json
 import os.path
 import sys
 import threading
@@ -18,92 +17,6 @@
 PY2 = sys.version_info[0] == 2
 
 
-def pymode_message(content):
-    """ Show message. """
-
-    vim.command('call pymode#wide_message("%s")' % str(content))
-
-
-def pymode_confirm(yes=True, msg='Do the changes:'):
-    """ Confirmation.
-
-    :return bool:
-
-    """
-    default = 'yes' if yes else 'no'
-    action = pymode_input(msg, default)
-    return action and 'yes'.startswith(action)
-
-
-def pymode_inputlist(msg, opts):
-    """ Get user choice.
-
-    :return str: A choosen option
-
-    """
-    choices = ['[Pymode] %s' % msg]
-    choices += ["%s. %s" % (num, opt) for num, opt in enumerate(opts, 1)]
-    try:
-        input_str = int(vim.eval('inputlist(%s)' % json.dumps(choices)))
-    except (KeyboardInterrupt, ValueError):
-        input_str = 0
-
-    if not input_str:
-        pymode_message('Cancelled!')
-        return False
-
-    try:
-        return opts[input_str - 1]
-    except (IndexError, ValueError):
-        pymode_error('Invalid option: %s' % input_str)
-        return pymode_inputlist(msg, opts)
-
-
-def pymode_input(umsg, udefault='', opts=None):
-    """ Get user input.
-
-    :return str: A user input
-
-    """
-    msg = '[Pymode] %s ' % umsg
-    default = udefault
-
-    if default != '':
-        msg += '[%s] ' % default
-
-    try:
-        vim.command('echohl Debug')
-        input_str = vim.eval('input("%s> ")' % msg)
-        vim.command('echohl none')
-    except KeyboardInterrupt:
-        input_str = ''
-
-    return input_str or default
-
-
-def pymode_error(content):
-    """ Show error. """
-
-    vim.command('call pymode#error("%s")' % str(content))
-
-
-def catch_and_print_exceptions(func):
-    """ Catch any exception.
-
-    :return func:
-
-    """
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except (Exception, vim.error) as e: # noqa
-            if DEBUG:
-                raise
-            pymode_error(e)
-            return None
-    return wrapper
-
-
 @contextmanager
 def silence_stderr():
     """ Redirect stderr. """
@@ -127,12 +40,3 @@ def patch_paths():
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs2'))
     else:
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs3'))
-
-
-debug = lambda _: None
-
-if DEBUG:
-    def debug(msg): # noqa
-        """ Debug message. """
-
-        print(msg)
diff --git a/python-mode.yaml b/python-mode.yaml

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`Gemfile.lock`
`10`	`10`	`VimFlavor.lock`
`11`	`11`	`_`
	`12`	`+build`
`12`	`13`	`tags`
`13`	`14`	`test.py`
`14`	`15`	`todo.txt`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[main]`
	`2`	`+ignore = R0201,R0922,C0111,E1103`