Open Source Projects Europe

--- a/ForgeWiki/forgewiki/command/wiki2markdown.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/__init__.py
@@ -1,5 +1,5 @@
 import os
-import base
+from forgewiki.command.base import WikiCommand
 from allura.command import base as allura_base
 
 from pylons import c
@@ -7,13 +7,13 @@
 from allura import model as M
 from allura.lib import exceptions
 
-from forgewiki.command.wiki2markdown_pages import PagesImportUnit
-from forgewiki.command.wiki2markdown_history import HistoryImportUnit
-from forgewiki.command.wiki2markdown_attachments import AttachmentsImportUnit
-from forgewiki.command.wiki2markdown_talk import TalkImportUnit
+from forgewiki.command.wiki2markdown.pages import PagesImportUnit
+from forgewiki.command.wiki2markdown.history import HistoryImportUnit
+from forgewiki.command.wiki2markdown.attachments import AttachmentsImportUnit
+from forgewiki.command.wiki2markdown.talk import TalkImportUnit
 
 
-class Wiki2MarkDownCommand(base.WikiCommand):
+class Wiki2MarkDownCommand(WikiCommand):
     min_args=1
     max_args=None
     summary = 'Export mediawiki to markdown'
@@ -23,7 +23,7 @@
         "attachments",
         "talk"
     ]
-    parser = base.Command.standard_parser(verbose=True)
+    parser = WikiCommand.standard_parser(verbose=True)
     parser.add_option('-e', '--extract-only', action='store_true', dest='extract',
                       help='Store data from the Allura mediawiki content on the local filesystem; not load into Allura')
     parser.add_option('-l', '--load-only', action='store_true', dest='load',

--- a/ForgeWiki/forgewiki/command/wiki2markdown_attachments.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/attachments.py
@@ -1,4 +1,4 @@
-from forgewiki.command.wiki2markdown_base import BaseImportUnit
+from forgewiki.command.wiki2markdown.base import BaseImportUnit
 
 class AttachmentsImportUnit(BaseImportUnit):
     def extract(self):

--- a/ForgeWiki/forgewiki/command/wiki2markdown_history.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/history.py
@@ -1,4 +1,4 @@
-from forgewiki.command.wiki2markdown_base import BaseImportUnit
+from forgewiki.command.wiki2markdown.base import BaseImportUnit
 
 class HistoryImportUnit(BaseImportUnit):
     def extract(self):

--- a/ForgeWiki/forgewiki/command/wiki2markdown_pages.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/pages.py
@@ -4,7 +4,7 @@
 
 from ming.orm.ormsession import ThreadLocalORMSession
 
-from forgewiki.command.wiki2markdown_base import BaseImportUnit
+from forgewiki.command.wiki2markdown.base import BaseImportUnit
 
 from allura.command import base as allura_base
 

--- a/ForgeWiki/forgewiki/command/wiki2markdown_talk.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/talk.py
@@ -1,4 +1,4 @@
-from forgewiki.command.wiki2markdown_base import BaseImportUnit
+from forgewiki.command.wiki2markdown.base import BaseImportUnit
 
 class TalkImportUnit(BaseImportUnit):
     def extract(self):