Fix code.

klen · klen · commit 246addfb2cca · 2014-06-07T13:15:38.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,12 +1,13 @@
 Changelog
 =========
 
+    * Pylama updated to version 3.3.2
     * Get fold's expression symbol from &fillchars;
     * Fixed error when setting g:pymode_breakpoint_cmd (expobrain);
     * Fixed code running;
     * Ability to override rope project root and .ropeproject folder
     * Added path argument to `PymodeRopeNewProject` which skips prompt
-
+    * Disable `pymode_rope_lookup_project` by default
     * Options added:
         'pymode_rope_project_root', 'pymode_rope_ropefolder'
 
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -381,7 +381,7 @@ possibly unrelated, files)
 Enable searching for |.ropeproject| in parent directories
                                                   *'g:pymode_rope_lookup_project'*
 >
-    let g:pymode_rope_lookup_project = 1
+    let g:pymode_rope_lookup_project = 0
 
 You can also manually set the rope project directory. If not specified rope will
 use the current directory.
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -158,7 +158,7 @@ call pymode#default('g:pymode_rope_project_root', '')
 call pymode#default('g:pymode_rope_ropefolder', '.ropeproject') 
 
 " If project hasnt been finded in current working directory, look at parents directory
-call pymode#default('g:pymode_rope_lookup_project', 1)
+call pymode#default('g:pymode_rope_lookup_project', 0)
 
 " Enable Rope completion
 call pymode#default('g:pymode_rope_completion', 1)
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -293,7 +293,7 @@ def get_ctx(*args, **kwargs):
             return resources.get(path)
 
         project_path = env.var('g:pymode_rope_project_root')
-        if project_path:
+        if not project_path:
             project_path = env.curdir
             env.debug('Look ctx', project_path)
             if env.var('g:pymode_rope_lookup_project', True):
@@ -302,10 +302,13 @@ def get_ctx(*args, **kwargs):
         if not os.path.exists(project_path):
             env.error("Rope project root not exist: %s" % project_path)
             ctx = None
+
         else:
             ctx = projects.get(project_path)
+
         if not ctx:
             projects[project_path] = ctx = cls(path, project_path)
+
         resources[path] = ctx
         return ctx
     return get_ctx

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ possibly unrelated, files)`
`381`	`381`	`Enable searching for \|.ropeproject\| in parent directories`
`382`	`382`	`'g:pymode_rope_lookup_project'`
`383`	`383`	`>`
`384`		`- let g:pymode_rope_lookup_project = 1`
	`384`	`+ let g:pymode_rope_lookup_project = 0`
`385`	`385`
`386`	`386`	`You can also manually set the rope project directory. If not specified rope will`
`387`	`387`	`use the current directory.`