diff -r 48c1672ec771 o.jython.distro/external/binaries-list
--- a/o.jython.distro/external/binaries-list	Tue May 26 23:08:37 2015 +0200
+++ b/o.jython.distro/external/binaries-list	Fri May 29 12:53:44 2015 +0200
@@ -1,1 +1,2 @@
 DA149FA5AF1D3CAA2648F122EEF10EE49807D0C0 jython-2.7.0-rc3.zip
+7747A693D0B49F4AED0E5C296385A0807679B37D jython-parser.jar
diff -r 48c1672ec771 o.jython/build.xml
--- a/o.jython/build.xml	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="contrib/o.jython" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.jython.</description>
-    <import file="../../nbbuild/templates/projectized.xml"/>
-</project>
diff -r 48c1672ec771 o.jython/external/binaries-list
--- a/o.jython/external/binaries-list	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7747A693D0B49F4AED0E5C296385A0807679B37D jython-parser.jar
diff -r 48c1672ec771 o.jython/external/isatty.diff
--- a/o.jython/external/isatty.diff	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-Index: src/org/python/core/util/FileUtil.java
-===================================================================
---- src/org/python/core/util/FileUtil.java	(revision 6493)
-+++ src/org/python/core/util/FileUtil.java	(working copy)
-@@ -66,12 +66,7 @@
-     }
- 
-     public static boolean isatty(FileDescriptor fd) {
--        try {
--            return imp.load("os").__getattr__("isatty").__call__(Py.java2py(fd)).__nonzero__();
--        } catch (PyException e) {
--            // Weak isatty check copied from jna-posix JavaPOSIX class
--            return fd == FileDescriptor.in || fd == FileDescriptor.out || fd == FileDescriptor.err;
--        }
-+        return fd == FileDescriptor.in || fd == FileDescriptor.out || fd == FileDescriptor.err;
-     }
- 
- }
diff -r 48c1672ec771 o.jython/external/update_jython.sh
--- a/o.jython/external/update_jython.sh	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-repository=https://bitbucket.org/jython/jython
-
-# Name of jar file we're creating from the jython.jar
-target=jython-parser.jar
-
-# Temp build location
-location=tmp
-
-echo "fetching sources"
-rm -rf "$location"
-hg clone "$repository" "$location"
-cd "$location"
-
-# Note - need both ant calls
-echo "Building jar"
-ant
-ant jar-complete
-
-cd ..
-mv "$location"/dist/jython.jar "$target"
-
-echo "Updating binaries-list"
-echo $(openssl dgst -sha1 "$target" | awk '{ print toupper($2) }') "$target" > binaries-list
-
-echo "Cleaning up"
-rm -rf "$location"
-
-echo "Done."
diff -r 48c1672ec771 o.jython/manifest.mf
--- a/o.jython/manifest.mf	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.jython/2
-OpenIDE-Module-Localizing-Bundle: org/jython/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.11
-AutoUpdate-Show-In-Client: false
-
diff -r 48c1672ec771 o.jython/nbproject/project.properties
--- a/o.jython/nbproject/project.properties	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-
-# NOTE: Also keep in sync with o.jython.distro/nbproject/project.properties
-# TODO The second dependency should be easy to automate with a <property file=...>
-#
-jython_src_version=2.7.0-rc3
-
-is.autoload=true
-extra.module.files=modules/ext/jython-parser.jar
-release.external/jython-parser.jar=modules/ext/jython-parser.jar
-
-# See http://www.netbeans.org/issues/show_bug.cgi?id=144637
-nbm.needs.restart=true
-
-sigtest.gen.fail.on.error=false
diff -r 48c1672ec771 o.jython/nbproject/project.xml
--- a/o.jython/nbproject/project.xml	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.jython</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.xerces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <friend-packages>
-                <friend>org.netbeans.modules.python.editor</friend>
-                <package>org.python.antlr</package>
-                <package>org.python.antlr.ast</package>
-                <package>org.python.antlr.base</package>
-                <package>org.python.antlr.runtime</package>
-                <package>org.python.antlr.runtime.tree</package>
-                <package>org.python.core</package>
-                <package>org.python.expose</package>
-            </friend-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/jython-parser.jar</runtime-relative-path>
-                <binary-origin>external/jython-parser.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff -r 48c1672ec771 o.jython/src/org/jython/Bundle.properties
--- a/o.jython/src/org/jython/Bundle.properties	Tue May 26 23:08:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-OpenIDE-Module-Display-Category=Python
-OpenIDE-Module-Name=jython
diff -r 48c1672ec771 python.editor/build-python.xml
--- a/python.editor/build-python.xml	Tue May 26 23:08:37 2015 +0200
+++ b/python.editor/build-python.xml	Fri May 29 12:53:44 2015 +0200
@@ -73,7 +73,6 @@
             <property name="scan.binaries" value="true"/>
             
             <buildpath location="o.jython.distro"/>
-            <buildpath location="o.jython"/>
             <buildpath location="python.core"/>
             <buildpath location="python.debugger"/>
             <buildpath location="python.platform"/>
@@ -102,7 +101,6 @@
             <buildpath location="gsf.codecoverage"/>
 
             <buildpath location="o.jython.distro"/>
-            <buildpath location="o.jython"/>
             <buildpath location="python.editor"/>
             <buildpath location="python.console"/>
             <buildpath location="python.core"/>