diff --git a/README.md b/README.md index 1d54446..19fdbe3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ PyProg is an Open-Source library for creating progress indicators (e.g. progress # Compatibility -PyProg is compatible with both Python 3 and Python 2. +PyProg is compatible with both Python 3 and Python 2, and will also work on Qt Console. # Getting Started diff --git a/build/lib/pyprog/ProgressBar.py b/build/lib/pyprog/ProgressBar.py index 45b0627..dd30672 100644 --- a/build/lib/pyprog/ProgressBar.py +++ b/build/lib/pyprog/ProgressBar.py @@ -24,8 +24,8 @@ def __init__(self, prefix, suffix, total=100, bar_length=50, initial=0, decimals self.wrap_bar_prefix = wrap_bar_prefix self.wrap_bar_suffix = wrap_bar_suffix - def __print(self, data, end="\n"): - sys.stdout.write(data + end) + def __print(self, data, start="", end=""): + sys.stdout.write(start + data + end) def set_prefix(self, prefix): ''' @@ -159,7 +159,7 @@ def update(self): final = final[:bar_cut_from] + progress_str + final[bar_cut_to:] final = final + self.progress_explain final = self.p + final + self.s - self.__print(final, end="\r") + self.__print(final, start="\r") def end(self): ''' diff --git a/build/lib/pyprog/ProgressIndicatorFraction.py b/build/lib/pyprog/ProgressIndicatorFraction.py index 3d114e9..0afa178 100644 --- a/build/lib/pyprog/ProgressIndicatorFraction.py +++ b/build/lib/pyprog/ProgressIndicatorFraction.py @@ -8,8 +8,8 @@ def __init__(self, prefix, suffix, total, initial=0): self.length = total self.current_stat = initial - def __print(self, data, end="\n"): - sys.stdout.write(data + end) + def __print(self, data, start="", end=""): + sys.stdout.write(start + data + end) def set_prefix(self, prefix): ''' @@ -42,7 +42,7 @@ def update(self): ''' final = str(self.current_stat) + "/" + str(self.length) final = self.p + final + self.s - self.__print(final, end="\r") + self.__print(final, start="\r") def end(self): ''' diff --git a/dist/pyprog-1.0.1-py2.py3-none-any.whl b/dist/pyprog-1.0.1-py2.py3-none-any.whl deleted file mode 100644 index 2502fc2..0000000 Binary files a/dist/pyprog-1.0.1-py2.py3-none-any.whl and /dev/null differ diff --git a/dist/pyprog-1.0.1.tar.gz b/dist/pyprog-1.0.1.tar.gz deleted file mode 100644 index e6175d9..0000000 Binary files a/dist/pyprog-1.0.1.tar.gz and /dev/null differ diff --git a/dist/pyprog-1.0.2-py2.py3-none-any.whl b/dist/pyprog-1.0.2-py2.py3-none-any.whl new file mode 100644 index 0000000..7dcc8c8 Binary files /dev/null and b/dist/pyprog-1.0.2-py2.py3-none-any.whl differ diff --git a/dist/pyprog-1.0.2.tar.gz b/dist/pyprog-1.0.2.tar.gz new file mode 100644 index 0000000..79a1961 Binary files /dev/null and b/dist/pyprog-1.0.2.tar.gz differ diff --git a/pyprog.egg-info/PKG-INFO b/pyprog.egg-info/PKG-INFO index f7923b3..96787cb 100644 --- a/pyprog.egg-info/PKG-INFO +++ b/pyprog.egg-info/PKG-INFO @@ -1,7 +1,7 @@ Metadata-Version: 1.0 Name: pyprog -Version: 1.0.1 -Summary: A library for creating customizable progress indicators. +Version: 1.0.2 +Summary: A library for creating super customizable progress indicators. Home-page: https://github.com/Bill13579/pyprog Author: Bill Kudo Author-email: bluesky42624@gmail.com diff --git a/pyprog/ProgressBar.py b/pyprog/ProgressBar.py index 45b0627..dd30672 100644 --- a/pyprog/ProgressBar.py +++ b/pyprog/ProgressBar.py @@ -24,8 +24,8 @@ def __init__(self, prefix, suffix, total=100, bar_length=50, initial=0, decimals self.wrap_bar_prefix = wrap_bar_prefix self.wrap_bar_suffix = wrap_bar_suffix - def __print(self, data, end="\n"): - sys.stdout.write(data + end) + def __print(self, data, start="", end=""): + sys.stdout.write(start + data + end) def set_prefix(self, prefix): ''' @@ -159,7 +159,7 @@ def update(self): final = final[:bar_cut_from] + progress_str + final[bar_cut_to:] final = final + self.progress_explain final = self.p + final + self.s - self.__print(final, end="\r") + self.__print(final, start="\r") def end(self): ''' diff --git a/pyprog/ProgressIndicatorFraction.py b/pyprog/ProgressIndicatorFraction.py index 3d114e9..0afa178 100644 --- a/pyprog/ProgressIndicatorFraction.py +++ b/pyprog/ProgressIndicatorFraction.py @@ -8,8 +8,8 @@ def __init__(self, prefix, suffix, total, initial=0): self.length = total self.current_stat = initial - def __print(self, data, end="\n"): - sys.stdout.write(data + end) + def __print(self, data, start="", end=""): + sys.stdout.write(start + data + end) def set_prefix(self, prefix): ''' @@ -42,7 +42,7 @@ def update(self): ''' final = str(self.current_stat) + "/" + str(self.length) final = self.p + final + self.s - self.__print(final, end="\r") + self.__print(final, start="\r") def end(self): ''' diff --git a/pyprog/__pycache__/ProgressBar.cpython-36.pyc b/pyprog/__pycache__/ProgressBar.cpython-36.pyc index e70094e..e46fe2c 100644 Binary files a/pyprog/__pycache__/ProgressBar.cpython-36.pyc and b/pyprog/__pycache__/ProgressBar.cpython-36.pyc differ diff --git a/pyprog/__pycache__/ProgressIndicatorFraction.cpython-36.pyc b/pyprog/__pycache__/ProgressIndicatorFraction.cpython-36.pyc index 2925c0a..2360021 100644 Binary files a/pyprog/__pycache__/ProgressIndicatorFraction.cpython-36.pyc and b/pyprog/__pycache__/ProgressIndicatorFraction.cpython-36.pyc differ diff --git a/setup.py b/setup.py index f090d08..f2b4c63 100644 --- a/setup.py +++ b/setup.py @@ -6,9 +6,9 @@ setup( name = 'pyprog', - version = '1.0.1', + version = '1.0.2', packages = find_packages(), - description = ('A library for creating customizable progress indicators.'), + description = ('A library for creating super customizable progress indicators.'), long_description = long_description, author = 'Bill Kudo', author_email = 'bluesky42624@gmail.com',