[Python-modules-commits] [greekocr4gamera] 01/08: unapply patches from git-dpm

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch debian/master
in repository greekocr4gamera.

commit 2878e7814db49b4809f87b4ae9eabf98d0b8b22c
Author: Daniel Stender <stender at debian.org>
Date:   Sun Jul 16 12:05:15 2017 +0200

    unapply patches from git-dpm
---
 doc/gendoc.py              | 26 +++++++++++++++-----------
 scripts/greekocr4gamera.py |  3 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/gendoc.py b/doc/gendoc.py
index 6a143f4..2ab7d89 100644
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -1,20 +1,24 @@
 #!/usr/bin/env python
 
-import os
-import sys
-
 from gamera import gendoc
 
 if __name__ == '__main__':
+   # Step 1:
+   # Import all of the plugins to document.
+   # Be careful not to load the core plugins, or they
+   # will be documented here, too.
+   # If the plugins are not already installed, we'll just ignore
+   # them and generate the narrative documentation.
+   try:
+      from gamera.toolkits.greekocr.plugins import clear
+   except ImportError:
+      print "WARNING:"
+      print "This `greekocr` toolkit must be installed before generating"
+      print "the documentation.  For now, the system will skip generating"
+      print "documentation for the plugins."
+      print
 
-   import gamera.toolkits
-   gamera.toolkits.__path__[:0] = [os.path.join(
-      sys.path[0],
-      os.pardir,
-      'gamera',
-      'toolkits'
-   )]
-
+   # Step 2:
    # Generate documentation for this toolkit
    # This will handle any commandline arguments if necessary
    gendoc.gendoc(classes=[("gamera.toolkits.greekocr.greekocr",
diff --git a/scripts/greekocr4gamera.py b/scripts/greekocr4gamera.py
index 7e41a72..d7eac4e 100755
--- a/scripts/greekocr4gamera.py
+++ b/scripts/greekocr4gamera.py
@@ -16,7 +16,7 @@
 # 
 # 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 St., Fifth floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 # This just simply runs the greekocr toolkits main function
@@ -59,7 +59,6 @@ while i < len(args):
       options["trainingdata"] = args[i]
    elif args[i] in ("--help", "-h"):
       usage()
-      sys.exit(0)
    elif args[i] in ("--wholistic", "-w"):
       options["mode"] = "wholistic"
    elif args[i] in ("--separatistic", "-s"):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/greekocr4gamera.git