From f97c27a2d02329de6e68aec31364b2d605b63b6f Mon Sep 17 00:00:00 2001 From: hastagAB Date: Thu, 2 Jul 2020 01:09:33 +0530 Subject: [PATCH] fix(path): fix import path for all files --- extractor/languages/c.py | 2 +- extractor/languages/c_sharp.py | 2 +- extractor/languages/cpp.py | 2 +- extractor/languages/css.py | 2 +- extractor/languages/go.py | 2 +- extractor/languages/haskell.py | 2 +- extractor/languages/html.py | 2 +- extractor/languages/java.py | 2 +- extractor/languages/javascript.py | 2 +- extractor/languages/kotlin.py | 2 +- extractor/languages/matlab.py | 2 +- extractor/languages/perl.py | 2 +- extractor/languages/php.py | 2 +- extractor/languages/python.py | 2 +- extractor/languages/r.py | 2 +- extractor/languages/ruby.py | 2 +- extractor/languages/rust.py | 2 +- extractor/languages/scala.py | 2 +- extractor/languages/shell.py | 2 +- extractor/languages/swift.py | 2 +- extractor/main.py | 4 ++-- setup.py | 11 ++++++----- 22 files changed, 28 insertions(+), 27 deletions(-) diff --git a/extractor/languages/c.py b/extractor/languages/c.py index 2068111..8f56ac7 100644 --- a/extractor/languages/c.py +++ b/extractor/languages/c.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def cExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/c_sharp.py b/extractor/languages/c_sharp.py index 05b223d..f255ecb 100644 --- a/extractor/languages/c_sharp.py +++ b/extractor/languages/c_sharp.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def c_sharpExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/cpp.py b/extractor/languages/cpp.py index fd02219..3c88564 100644 --- a/extractor/languages/cpp.py +++ b/extractor/languages/cpp.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def cppExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/css.py b/extractor/languages/css.py index 4531980..8a0b26e 100644 --- a/extractor/languages/css.py +++ b/extractor/languages/css.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def cssExtractor(file): output = CommentSyntax() diff --git a/extractor/languages/go.py b/extractor/languages/go.py index 1d6692e..3d74614 100644 --- a/extractor/languages/go.py +++ b/extractor/languages/go.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def goExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/haskell.py b/extractor/languages/haskell.py index 55b290d..02c4fef 100644 --- a/extractor/languages/haskell.py +++ b/extractor/languages/haskell.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def haskellExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/html.py b/extractor/languages/html.py index 55bb304..d097c8f 100644 --- a/extractor/languages/html.py +++ b/extractor/languages/html.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def htmlExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/java.py b/extractor/languages/java.py index b90d7c4..b77d82b 100644 --- a/extractor/languages/java.py +++ b/extractor/languages/java.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def javaExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/javascript.py b/extractor/languages/javascript.py index f603d51..99b5d88 100644 --- a/extractor/languages/javascript.py +++ b/extractor/languages/javascript.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def javascriptExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/kotlin.py b/extractor/languages/kotlin.py index dcb5760..4b60926 100644 --- a/extractor/languages/kotlin.py +++ b/extractor/languages/kotlin.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def kotlinExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/matlab.py b/extractor/languages/matlab.py index b82cc93..3878222 100644 --- a/extractor/languages/matlab.py +++ b/extractor/languages/matlab.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def matlabExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/perl.py b/extractor/languages/perl.py index 667e4bb..4f4c58f 100644 --- a/extractor/languages/perl.py +++ b/extractor/languages/perl.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def perlExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/php.py b/extractor/languages/php.py index 1526a3b..2c70ac1 100644 --- a/extractor/languages/php.py +++ b/extractor/languages/php.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def phpExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/python.py b/extractor/languages/python.py index 6301c81..23b5772 100644 --- a/extractor/languages/python.py +++ b/extractor/languages/python.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def pythonExtractor(file): diff --git a/extractor/languages/r.py b/extractor/languages/r.py index 7303809..02301b3 100644 --- a/extractor/languages/r.py +++ b/extractor/languages/r.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def rExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/ruby.py b/extractor/languages/ruby.py index 7dda7cc..8efb8ed 100644 --- a/extractor/languages/ruby.py +++ b/extractor/languages/ruby.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def rubyExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/rust.py b/extractor/languages/rust.py index b6c1b78..cf731dd 100644 --- a/extractor/languages/rust.py +++ b/extractor/languages/rust.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def rustExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/scala.py b/extractor/languages/scala.py index d8c41e8..2c09a57 100644 --- a/extractor/languages/scala.py +++ b/extractor/languages/scala.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def scalaExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/shell.py b/extractor/languages/shell.py index b950a62..dfe2cc3 100644 --- a/extractor/languages/shell.py +++ b/extractor/languages/shell.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def shellExtractor(file): result = CommentSyntax() diff --git a/extractor/languages/swift.py b/extractor/languages/swift.py index 93c49b7..8e5af56 100644 --- a/extractor/languages/swift.py +++ b/extractor/languages/swift.py @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' -from binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax +from extractor.binder import readSingleLine, readMultiLineSame, readMultiLineDiff, CommentSyntax def swiftExtractor(file): result = CommentSyntax() diff --git a/extractor/main.py b/extractor/main.py index f428c6c..69272e4 100644 --- a/extractor/main.py +++ b/extractor/main.py @@ -24,8 +24,8 @@ import json import argparse -from binder import * -from languages import * +from extractor.binder import * +from extractor.languages import * class CommentExtractor: diff --git a/setup.py b/setup.py index 495fc04..2176bcc 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( name='Nirjas', - version='0.0.2', + version='0.0.1', description='A Python library to extract comments and source code out of your file(s)', long_description=long_description, long_description_content_type='text/markdown', @@ -60,8 +60,9 @@ keywords='Comment Extractor, Code Comment Extractor, Source Code Extractor, Source Extractor', packages=find_packages(), python_requires = ">=3", - entry_points = """ - [console_scripts] - nirjas=main:main - """, + entry_points = { + 'console_scripts': [ + 'nirjas = extractor.main:main' + ] + }, ) \ No newline at end of file