[GNUnet-SVN] [libextractor-python] branch master updated (145c8db -> e753f1f)

[gnunet]

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

ng0 pushed a change to branch master
in repository libextractor-python.

    from 145c8db  mailmap
     new 3f4b4d4  more pep adjustments. while we're at it, bump displayed 
version to next version release
     new cbc832e  whitespace only.
     new e753f1f  fix up comment style

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 libextractor/extractor.py | 23 ++++++++++++-----------
 setup.py                  | 28 ++++++++++++++--------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/libextractor/extractor.py b/libextractor/extractor.py
index 24246ad..6234e84 100644
--- a/libextractor/extractor.py
+++ b/libextractor/extractor.py
@@ -41,7 +41,7 @@ except OSError:
     libextractor = cdll.extractor
 
 __all__ = ['Extractor']
-__version__ = "0.6"
+__version__ = "0.6.2"
 __licence__ = "GNU GPL"
 
 """
@@ -90,8 +90,8 @@ class Extractor(object):
         if defaults:
             self.extractors = libextractor.EXTRACTOR_plugin_add_defaults(0)
         if libraries:
-            self.extractors = libextractor.EXTRACTOR_plugin_add_config 
(self.extractors, libraries, 0)
-    
+            self.extractors = 
libextractor.EXTRACTOR_plugin_add_config(self.extractors, libraries, 0)
+
     def extract(self, proc, proc_cls, filename=None, data=None, size=0):
         """
         Extract keywords from a file, or from its data.
@@ -101,20 +101,20 @@ class Extractor(object):
         @param size: data size
         @param proc: function to call on each value
         @param proc_cls: closure to proc
-       
+
         If you give data, size has to be given as well.
 
         """
         if not filename and not (data and size):
             return None
         else:
-            libextractor.EXTRACTOR_extract (self.extractors, filename, data, 
size, EXTRACT_CB(proc), proc_cls)
+            libextractor.EXTRACTOR_extract(self.extractors, filename, data, 
size, EXTRACT_CB(proc), proc_cls)
 
     def addLibrary(self, library):
         """
         Add given library to the extractor. Invoke with a string with the name
         of the library that should be added.  For example,
-        
+
         'libextractor_filename'
 
         will prepend the extractor that just adds the filename as a
@@ -124,11 +124,11 @@ class Extractor(object):
         found.
 
         @param library: library's name
-        """    
-        self.extractors = libextractor.EXTRACTOR_plugin_add (self.extractors, 
library, NULL, 0)
+        """
+        self.extractors = libextractor.EXTRACTOR_plugin_add(self.extractors, 
library, NULL, 0)
 
     def removeLibrary(self, library):
-        """      
+        """
         Remove a library.  Pass the name of the library that is to
         be removed.  Only one library can be removed at a time.
         For example,
@@ -145,7 +145,7 @@ class Extractor(object):
 
     def addLibraries(self, libraries):
         """
-        Add given libraries. 
+        Add given libraries.
         Same as addLibary but libraries is a list of library's names.
 
         @param libraries: list of libraries names
@@ -160,7 +160,7 @@ class Extractor(object):
 
         libextractor.EXTRACTOR_plugin_remove_all(self.extractors)
         self.extractors = None
-       
+
     def keywordTypes(self):
         """
         Returns the list of all keywords types.
@@ -186,6 +186,7 @@ class Extractor(object):
         if self.extractors:
             self.removeAllLibraries()
 
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()
diff --git a/setup.py b/setup.py
index 46bfba2..c2dd0a0 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
     packages = ['libextractor'],
     scripts = ['examples/extract.py'],
 
-    #install_requires = ['ctypes >= 0.9'],
+    # install_requires = ['ctypes >= 0.9'],
 
     # metadata for upload to PyPI
     author = "Bader Ladjemi, Christian Grothoff, Nils Gillmann (ng0)",
@@ -19,26 +19,26 @@ setup(
     description = "Python bindings for GNU libextractor",
     license = "GNU GPLv3+",
     keywords = "libextractor binding tag metadata",
-    url = "https://www.gnu.org/s/libextractor/";,  
+    url = "https://www.gnu.org/s/libextractor/";,
     long_description="""libextractor is a simple library for keyword 
extraction.  libextractor
 does not support all formats but supports a simple plugging mechanism
 such that you can quickly add extractors for additional formats, even
 without recompiling libextractor. libextractor typically ships with a
 dozen helper-libraries that can be used to obtain keywords from common
-file-types.  
+file-types.
 
 libextractor is a part of the GNU project (https://www.gnu.org/).""",
-    
+
     classifiers=['Development Status :: 3 - Alpha',
-                'Intended Audience :: Developers',
-                'License :: OSI Approved :: GNU General Public License (GPL)',
-                'Operating System :: OS Independent',
-                'Operating System :: MacOS :: MacOS X',
-                'Operating System :: Microsoft :: Windows',
-                'Operating System :: POSIX',
-                'Topic :: System :: Filesystems',
-                'Topic :: Text Processing :: Filters'],
-    
+                 'Intended Audience :: Developers',
+                 'License :: OSI Approved :: GNU General Public License (GPL)',
+                 'Operating System :: OS Independent',
+                 'Operating System :: MacOS :: MacOS X',
+                 'Operating System :: Microsoft :: Windows',
+                 'Operating System :: POSIX',
+                 'Topic :: System :: Filesystems',
+                 'Topic :: Text Processing :: Filters'],
+
     platforms=['windows', 'Linux', 'MacOS X', 'Solaris', 'FreeBSD'],
-    
+
 )

-- 
To stop receiving notification emails like this one, please contact
address@hidden