From 6f3988a31665399851040927916e26bbee0988e6 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Tue, 6 Nov 2012 19:02:07 +0100
Subject: [PATCH 1/2] Don't add extra slash (PY-7955).

---
 python/helpers/generator3.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/helpers/generator3.py b/python/helpers/generator3.py
index aa03ca2929a2..57f92f29430a 100644
--- a/python/helpers/generator3.py
+++ b/python/helpers/generator3.py
@@ -2208,7 +2208,7 @@ def buildOutputName(subdir, name):
     global action
     quals = name.split(".")
     dirname = subdir
-    if dirname and not dirname.endswith(os.path.sep):
+    if dirname and not dirname.endswith("/") and not dirname.endswith("\\") :
         dirname += os.path.sep # "a -> a/"
     for pathindex in range(len(quals) - 1): # create dirs for all quals but last
         subdirname = dirname + os.path.sep.join(quals[0: pathindex + 1])

From 6377e075fe7570d0a25e048e67334db9196704c2 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 6 Nov 2012 23:22:38 +0100
Subject: [PATCH 2/2] move service declaration to correct place (PY-7953)

---
 python/rest/resources/META-INF/rest.xml      | 2 --
 python/src/META-INF/python-plugin-common.xml | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/python/rest/resources/META-INF/rest.xml b/python/rest/resources/META-INF/rest.xml
index e5b5ec5a4480..b8e5f8db5da1 100644
--- a/python/rest/resources/META-INF/rest.xml
+++ b/python/rest/resources/META-INF/rest.xml
@@ -7,8 +7,6 @@
     <lang.parserDefinition language="ReST" implementationClass="com.jetbrains.rest.parsing.RestParserDefinition"/>
     <colorSettingsPage implementation="com.jetbrains.rest.RestColorsPage"/>
 
-    <projectService serviceInterface="com.jetbrains.python.ReSTService"
-                    serviceImplementation="com.jetbrains.python.ReSTService"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.DirectiveCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.OptionCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.ReferenceCompletionContributor"/>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 2f9c298478f4..f389f7c3db49 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -90,6 +90,9 @@
 
     <targetElementEvaluator language="Python" implementationClass="com.jetbrains.python.codeInsight.PyTargetElementEvaluator"/>
 
+    <projectService serviceInterface="com.jetbrains.python.ReSTService"
+                    serviceImplementation="com.jetbrains.python.ReSTService"/>
+
     <!-- Run/Debug -->
     <applicationService serviceInterface="com.jetbrains.python.run.PyRunConfigurationFactory"
                         serviceImplementation="com.jetbrains.python.run.PyRunConfigurationFactoryImpl"/>