Merge branch 'new-structure' into test-v3

__init__.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8  -*-
-#
-#  __init__.py
-#
-#  Copyright 2015 GOLDERWEB – Jonathan Golder <jonathan@golderweb.de>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  MA 02110-1301, USA.
-#
-#
-"""
-Scripts for our redundances bot
-"""

redfam.py

@@ -33,7 +33,7 @@ from datetime import datetime
 import pywikibot
 
 import jogobot
-from .mysqlred import MysqlRedFam
+from mysqlred import MysqlRedFam
 
 
 class RedFam:

redpage.py

@@ -27,8 +27,8 @@ Provides a class for handling redundance discussion pages and archives
 
 import pywikibot  # noqa
 
-from .mysqlred import MysqlRedPage
+from mysqlred import MysqlRedPage
-from .redfam import RedFamParser
+from redfam import RedFamParser
 
 
 class RedPage:
@@ -94,7 +94,7 @@ class RedPage:
         else:
                 return False
         
-    def parse( self ):
+    def parse( self ):  # noqa
         """
         Handles the parsing process
         """
@@ -158,9 +158,8 @@ class RedPage:
                             ending = RedFamParser.is_ending2( text_lines[ j ] )
                     
                     # Create the RedFam object
-                    red_fam = RedFamParser( fam_heading, self.page._pageid,
+                    RedFamParser( fam_heading, self.page._pageid,
-                                            self.is_archive(), beginning,
+                                  self.is_archive(), beginning, ending )
-                                            ending )
             
             # Increment line counter
             i += 1