Merge branch 'release/0.7.6b'

klen · klen · commit 41999ff15a70 · 2013-12-04T13:03:21.000+07:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-02 0.7.5b
+## 2013-12-04 0.7.6b
 --------------------
     * Update indentation support;
     * Python3 support;
diff --git a/Makefile b/Makefile
@@ -45,6 +45,7 @@ PACKAGE_MAINTAINER="Kirill Klenov <horneds@gmail.com>"
 PACKAGE_URL=http://github.com/klen/python-mode
 deb: clean $(CURDIR)/build
 	@git co gh-pages
+	@rm -rf deb
 	@fpm -s dir -t deb -a all \
 	    -n $(PACKAGE_NAME) \
 	    -v $(PACKAGE_VERSION) \
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.7.5b
+                          Version: 0.7.6b
 
 ==============================================================================
 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.5b"
+let g:pymode_version = "0.7.6b"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
@@ -147,6 +147,9 @@ call pymode#default('g:pymode_breakpoint_cmd', '')
 " Rope support
 call pymode#default('g:pymode_rope', 1)
 
+" System plugin variable
+call pymode#default('g:pymode_rope_current', '')
+
 " If project hasnt been finded in current working directory, look at parents directory
 call pymode#default('g:pymode_rope_lookup_project', 1)
 
diff --git a/pymode/libs/pylama/__init__.py b/pymode/libs/pylama/__init__.py
@@ -5,7 +5,7 @@
 
 """
 
-version_info = 2, 0, 3
+version_info = 2, 0, 4
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__
diff --git a/pymode/libs/pylama/config.py b/pymode/libs/pylama/config.py
@@ -128,7 +128,7 @@ def parse_linters(csp_str):
             if linter:
                 result.append((name, linter))
             else:
-                logging.warn("Linter `%s` not found." % name)
+                logging.warn("Linter `%s` not found.", name)
         return result
 
     parser.add_argument(
diff --git a/pymode/libs/pylama/core.py b/pymode/libs/pylama/core.py
@@ -5,6 +5,7 @@
 """
 import logging
 import re
+import sys
 from .lint.extensions import LINTERS
 
 #: The skip pattern
@@ -16,7 +17,7 @@
 
 # Setup a logger
 LOGGER = logging.getLogger('pylama')
-STREAM = logging.StreamHandler()
+STREAM = logging.StreamHandler(sys.stdout)
 LOGGER.addHandler(STREAM)
 
 
@@ -175,6 +176,9 @@ def __enter__(self):
             self.code = self._file.read() + '\n\n'
         return self
 
-    def __exit__(self):
+    def __exit__(self, t, value, traceback):
         if not self._file is None:
             self._file.close()
+
+        if t and LOGGER.level == logging.DEBUG:
+            LOGGER.debug(traceback)
diff --git a/pymode/lint.py b/pymode/lint.py
@@ -31,6 +31,10 @@ def code_check():
         env.stop()
         return False
 
+    if env.options.get('debug'):
+        from pylama.core import LOGGER, logging
+        LOGGER.setLevel(logging.DEBUG)
+
     with silence_stderr():
         errors = check_path(path, options=options, code=env.source)
 
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -23,6 +23,7 @@ def look_ropeproject(path):
     :return str|None: A finded path
 
     """
+    env.debug('Look project', path)
     p = os.path.abspath(path)
 
     while True:
@@ -31,7 +32,7 @@ def look_ropeproject(path):
 
         new_p = os.path.abspath(os.path.join(p, ".."))
         if new_p == p:
-            return '.'
+            return path
 
         p = new_p
 
@@ -279,7 +280,8 @@ def get_ctx(*args, **kwargs):
         if resources.get(path):
             return resources.get(path)
 
-        project_path = os.path.dirname(env.curdir)
+        project_path = env.curdir
+        env.debug('Look ctx', project_path)
         if env.var('g:pymode_rope_lookup_project', True):
             project_path = look_ropeproject(project_path)
 
@@ -353,8 +355,10 @@ def __init__(self, path, project_path):
             self.generate_autoimport_cache()
 
         env.debug('Context init', project_path)
+        env.message('Init Rope project: %s' % project_path)
 
     def __enter__(self):
+        env.let('g:pymode_rope_current', self.project.root.real_path)
         self.project.validate(self.project.root)
         self.resource = libutils.path_to_resource(
             self.project, env.curbuf.name, 'file')
diff --git a/pymode/utils.py b/pymode/utils.py
@@ -21,14 +21,18 @@
 def silence_stderr():
     """ Redirect stderr. """
 
-    with threading.Lock():
-        stderr = sys.stderr
-        sys.stderr = StringIO()
+    if DEBUG:
+        yield
 
-    yield
+    else:
+        with threading.Lock():
+            stderr = sys.stderr
+            sys.stderr = StringIO()
+
+        yield
 
-    with threading.Lock():
-        sys.stderr = stderr
+        with threading.Lock():
+            sys.stderr = stderr
 
 
 def patch_paths():
diff --git a/t/rope.vim b/t/rope.vim
@@ -1,6 +1,7 @@
 let g:pymode_rope_completion_bind = 'X'
 let g:pymode_rope_autoimport = 0
 let g:pymode_debug = 1
+let g:pymode_rope_lookup_project = 0
 
 source  plugin/pymode.vim 
 
@@ -16,10 +17,12 @@ describe 'pymode-plugin'
     end
 
     it 'pymode rope auto open project in current working directory'
-        let project_path = '.ropeproject'
+        let project_path = getcwd() . '/.ropeproject'
         Expect isdirectory(project_path)  == 0
         normal oimporX
         Expect getline('.') == 'import'
+        Expect g:pymode_rope_current == getcwd() . '/'
+        Expect g:pymode_rope_current . '.ropeproject' == project_path
         Expect isdirectory(project_path)  == 1
     end
 
