Refactoring, cleaining up imports, setting filemode

diff --git a/treecutter/const.py b/treecutter/const.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/treecutter/directory.py b/treecutter/directory.py
old mode 100755 (executable)
new mode 100644 (file)
index dd8ae44..edbdee1
--- a/treecutter/directory.py
+++ b/treecutter/directory.py
@@ -1,21 +1,8 @@
 #!/usr/bin/python
 import os
 import fnmatch
-import subprocess
-import amara
-import re
-import tempfile
-import errno
-import time
-import argparse
-import shutil
-import pygraphviz as pgv
-import glob
-import gettext
-import shutil
 from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
+import treecutter.const as const
 
 class Directory():
     """Class containing the state of the directory with articles"""

diff --git a/treecutter/link.py b/treecutter/link.py
old mode 100755 (executable)
new mode 100644 (file)
index b5dcf83..45504be
--- a/treecutter/link.py
+++ b/treecutter/link.py
@@ -1,21 +1,6 @@
 #!/usr/bin/python
-import os
-import fnmatch
-import subprocess
-import amara
-import re
-import tempfile
-import errno
-import time
-import argparse
-import shutil
-import pygraphviz as pgv
 import glob
-import gettext
-import shutil
-from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
+from treecutter.page import Page
 
 class Link():
     """Class representing a webpage on the site"""

diff --git a/treecutter/main.py b/treecutter/main.py
old mode 100755 (executable)
new mode 100644 (file)
index 3c30824..bbde870
--- a/treecutter/main.py
+++ b/treecutter/main.py
@@ -1,21 +1,9 @@
 #!/usr/bin/python
 import os
-import fnmatch
-import subprocess
-import amara
-import re
-import tempfile
-import errno
 import time
 import argparse
-import shutil
-import pygraphviz as pgv
-import glob
-import gettext
-import shutil
-from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
+from treecutter.directory import Directory
+from treecutter.sitemap import Sitemap
 
 parser = argparse.ArgumentParser(description='Process docbook article tree.')
 parser.add_argument('--style', nargs='?',

diff --git a/treecutter/page.py b/treecutter/page.py
old mode 100755 (executable)
new mode 100644 (file)
index a6c5502..1bd6cd7
--- a/treecutter/page.py
+++ b/treecutter/page.py
@@ -1,21 +1,12 @@
 #!/usr/bin/python
 import os
-import fnmatch
 import subprocess
-import amara
-import re
 import tempfile
-import errno
-import time
-import argparse
-import shutil
-import pygraphviz as pgv
-import glob
-import gettext
-import shutil
 from amara import bindery
 from amara.xslt import transform
 from Cheetah.Template import Template
+import treecutter.const as const
+from treecutter.tools import mkdir_p
 
 class Page():
     """Class representing a version of a webpage"""

diff --git a/treecutter/sitemap.py b/treecutter/sitemap.py
old mode 100755 (executable)
new mode 100644 (file)
index 11467de..d87c5c9
--- a/treecutter/sitemap.py
+++ b/treecutter/sitemap.py
@@ -1,21 +1,14 @@
 #!/usr/bin/python
 import os
-import fnmatch
-import subprocess
-import amara
 import re
-import tempfile
-import errno
 import time
-import argparse
 import shutil
-import pygraphviz as pgv
-import glob
 import gettext
-import shutil
+import tempfile
 from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
+from treecutter.trie import Trie
+from treecutter.link import Link
+from treecutter.tools import ssh_cmd, publish, mkdir_p
 
 class Sitemap():
     """Class keeping the internal site structure"""

diff --git a/treecutter/tools.py b/treecutter/tools.py
old mode 100755 (executable)
new mode 100644 (file)
index f6dd79b..f294c61
--- a/treecutter/tools.py
+++ b/treecutter/tools.py
@@ -1,21 +1,7 @@
 #!/usr/bin/python
 import os
-import fnmatch
 import subprocess
-import amara
-import re
-import tempfile
 import errno
-import time
-import argparse
-import shutil
-import pygraphviz as pgv
-import glob
-import gettext
-import shutil
-from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
 
 def mkdir_p(path):
     try:

diff --git a/treecutter/trie.py b/treecutter/trie.py
old mode 100755 (executable)
new mode 100644 (file)
index 446c642..b7a1c3d
--- a/treecutter/trie.py
+++ b/treecutter/trie.py
@@ -1,21 +1,5 @@
 #!/usr/bin/python
-import os
-import fnmatch
-import subprocess
-import amara
-import re
-import tempfile
-import errno
-import time
-import argparse
-import shutil
 import pygraphviz as pgv
-import glob
-import gettext
-import shutil
-from amara import bindery
-from amara.xslt import transform
-from Cheetah.Template import Template
 
 class Node():
     def __init__(self,token,value):