From 3ef82a6c3af05270cffb62a0cf067f424ceadb22 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sun, 18 Jan 2015 11:00:10 +0100
Subject: [PATCH] Update changelog for python pull request

---
 .../net/sourceforge/pmd/cpd/PythonTokenizer.java   |  4 ++++
 .../pmd/LanguageVersionDiscovererTest.java         | 14 ++++++--------
 .../sourceforge/pmd/cpd/PythonTokenizerTest.java   |  4 ----
 src/site/markdown/overview/changelog.md            |  6 ++++++
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java b/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java
index e940ca7d23..32847de7bc 100644
--- a/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java
+++ b/pmd-python/src/main/java/net/sourceforge/pmd/cpd/PythonTokenizer.java
@@ -16,8 +16,12 @@ import net.sourceforge.pmd.util.IOUtil;
 
 import org.apache.commons.io.IOUtils;
 
+/**
+ * The Python tokenizer.
+ */
 public class PythonTokenizer implements Tokenizer {
 
+    @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         StringBuilder buffer = sourceCode.getCodeBuffer();
         Reader reader = null;
diff --git a/pmd-python/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-python/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
index 174281de97..bb7862dbd6 100644
--- a/pmd-python/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
+++ b/pmd-python/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
@@ -1,10 +1,12 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
 package net.sourceforge.pmd;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 
-import junit.framework.JUnit4TestAdapter;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
@@ -18,15 +20,11 @@ public class LanguageVersionDiscovererTest {
      * Test on Python file with default version
      */
     @Test
-    public void testPlsql() {
+    public void testPython() {
         LanguageVersionDiscoverer discoverer = new LanguageVersionDiscoverer();
-        File plsqlFile = new File("/path/to/MY_PACKAGE.py");
+        File pythonFile = new File("/path/to/MY_PACKAGE.py");
 
-        LanguageVersion languageVersion = discoverer.getDefaultLanguageVersionForFile(plsqlFile);
+        LanguageVersion languageVersion = discoverer.getDefaultLanguageVersionForFile(pythonFile);
         assertEquals("LanguageVersion must be Python!", LanguageRegistry.getLanguage(PythonLanguageModule.NAME).getDefaultVersion(), languageVersion);
     }
-
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(LanguageVersionDiscovererTest.class);
-    }
 }
diff --git a/pmd-python/src/test/java/net/sourceforge/pmd/cpd/PythonTokenizerTest.java b/pmd-python/src/test/java/net/sourceforge/pmd/cpd/PythonTokenizerTest.java
index 269f930e4a..315d1d8e94 100644
--- a/pmd-python/src/test/java/net/sourceforge/pmd/cpd/PythonTokenizerTest.java
+++ b/pmd-python/src/test/java/net/sourceforge/pmd/cpd/PythonTokenizerTest.java
@@ -33,8 +33,4 @@ public class PythonTokenizerTest extends AbstractTokenizerTest {
         this.expectedTokenCount = 1218;
         super.tokenizeTest();
     }
-
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(PythonTokenizerTest.class);
-    }
 }
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index cdaacd7e74..a73418beab 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -2,12 +2,18 @@
 
 ## ???? - 5.2.4
 
+**New Supported Languages:**
+
+* Python (CPD)
+
 **Feature Requests and Improvements:**
 
 **New/Modified Rules:**
 
 **Pull Requests:**
 
+* [#11](https://github.com/adangel/pmd/pull/11): Added support for Python to CPD.
+
 **Bugfixes:**
 
 * [#1296](https://sourceforge.net/p/pmd/bugs/1296/): PMD UnusedPrivateMethod invalid detection of 'private void method(int,boolean,Integer...)'