Skip to content

Commit

Permalink
Clean up spaces in files I touched.
Browse files Browse the repository at this point in the history
This only affects spacing in documentation.  Specifically, I usually
put two spaces after a period, like I just did.  This rips out that
extra space in lots of documentation.
  • Loading branch information
merriam committed Feb 12, 2015
1 parent 4e3ee16 commit d9e2bbe
Show file tree
Hide file tree
Showing 15 changed files with 48 additions and 47 deletions.
6 changes: 3 additions & 3 deletions examples/application/app_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Suite of Application Builders
=============================
This explores different methods of starting an application. If you run
This explores different methods of starting an application. If you run
this without a command line parameter, you should see a menu in your terminal.
For example, you can rerun this with 'r' command to pick a random method.
There are lots of logging options to make this easier to debug: execution
order may not be obvious. Each time you run the command, only one kivy
There are lots of logging options to make this easier to debug: execution
order may not be obvious. Each time you run the command, only one kivy
application is created.
This uses the file testkvfile.kv and the file app_suite_data/testkvdir.kv.
Expand Down
6 changes: 3 additions & 3 deletions examples/application/app_with_kv.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
Application built from a .kv file
==================================
This shows how to implicitly use a .kv file for your application. You
This shows how to implicitly use a .kv file for your application. You
should see a full screen button labelled "Hello from test.kv".
After Kivy instantiates a subclass of App, it implicitly searches for a .kv
file. The file test.kv is selected because the name of the subclass of App is
TestApp, which implies that kivy should try to load "test.kv". That file
file. The file test.kv is selected because the name of the subclass of App is
TestApp, which implies that kivy should try to load "test.kv". That file
contains a root Widget.
'''

Expand Down
2 changes: 1 addition & 1 deletion examples/application/app_with_kv_in_template1.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
should see "Hello from template1/test.ky" as a button.
As kivy instantiates the TestApp subclass of App, the variable kv_directory
is set. Kivy then implicitly searches for a .kv file matching the name
is set. Kivy then implicitly searches for a .kv file matching the name
of the subclass in that directory, finding the file template1/test.kv. That
file contains a root of class Widget.
Expand Down
6 changes: 3 additions & 3 deletions examples/canvas/multitexture.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Multitexture Example
====================
This example blends two textures: the image mtexture1.png of the letter K
This example blends two textures: the image mtexture1.png of the letter K
and the image mtexture2.png of an orange circle. You should see an orange
K clipped to a circle. It uses a custom shader, written in glsl
K clipped to a circle. It uses a custom shader, written in glsl
(OpenGL Shading Language), stored in a local string.
Note the image mtexture1.png is a white 'K' on a transparent background, which
Expand Down Expand Up @@ -46,7 +46,7 @@ def __init__(self, **kwargs):

# here, we are binding a custom texture at index 1
# this will be used as texture1 in shader.
# The filenames are misleading: they do not correspond to the
# The filenames are misleading: they do not correspond to the
# index here or in the shader.
BindTexture(source='mtexture2.png', index=1)

Expand Down
6 changes: 3 additions & 3 deletions examples/canvas/repeat_texture.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<LabelOnBackground>:
canvas.before:
Color:
rgb: self.background
rgb: self.background
Rectangle:
pos: self.pos
size: self.size
pos: self.pos
size: self.size
FloatLayout:
canvas.before:
Expand Down
6 changes: 3 additions & 3 deletions examples/canvas/texture.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
========================================
This example changes texture properties and the properties
of its containing rectangle. You should see some a multicolored
of its containing rectangle. You should see some a multicolored
texture with sliders to the left and below and buttons at the
bottom of the screen. The image texture_example_image.png is
rendered into the rectangle. Sliders change the number of copies of the
bottom of the screen. The image texture_example_image.png is
rendered into the rectangle. Sliders change the number of copies of the
texture (the tex_coords), the size of enclosing rectangle (the taw_height
and taw_width) while the buttons change how the texture is rendered when more
than one copy is in the rectangle (the
Expand Down
8 changes: 4 additions & 4 deletions examples/demo/kivycatalog/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
The Kivy Catalog viewer showcases widgets available in Kivy
and allows interactive editing of kivy language code to get immediate
feedback. You should see a two panel screen with a menu spinner button
(starting with 'Welcome') and other controls across the top. The left pane
contains kivy (.kv) code, and the right side is that code rendered. You can
feedback. You should see a two panel screen with a menu spinner button
(starting with 'Welcome') and other controls across the top.The left pane
contains kivy (.kv) code, and the right side is that code rendered. You can
edit the left pane, though changes will be lost when you use the menu
spinner button. The catalog will show you dozens of .kv examples controlling
spinner button. The catalog will show you dozens of .kv examples controlling
different widgets and layouts.
The catalog's interface is set in the file kivycatalog.kv, while the
Expand Down
10 changes: 5 additions & 5 deletions examples/demo/multistroke/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
Multistroke Recognition Database Demonstration
==============================================
This application records gestures and attempts to match them. You should
see a black drawing surface with some buttons across the bottom. As you
This application records gestures and attempts to match them. You should
see a black drawing surface with some buttons across the bottom. As you
make a gesture on the drawing surface, the gesture will be added to
the history and a match will be attempted. If you go to the history tab,
the history and a match will be attempted. If you go to the history tab,
name the gesture, and add it to the database, then simliar gestures in the
future will be recognized. You can load and save databases of gestures
future will be recognized. You can load and save databases of gestures
in .kg files.
This demonstration code is many files, with this being the primary file.
The information pop-up ('No match') comes from the file helpers.py.
The history pane is managed in the file historymanager.py and described
in the file historymanager.kv. The database pane and storage is managed in
in the file historymanager.kv. The database pane and storage is managed in
the file gestureDatabase.py and the described in the file gestureDatabase.kv.
The general logic of the sliders and buttons are in the file
settings.py and described in settings.kv. but the actual settings pane is
Expand Down
6 changes: 3 additions & 3 deletions examples/demo/pictures/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Basic Picture Viewer
====================
This simple image browser demonstrates the scatter widget. You should
see three framed photographs on a background. You can click and drag
This simple image browser demonstrates the scatter widget. You should
see three framed photographs on a background. You can click and drag
the photos around, or multi-touch to drop a red dot to scale and rotate the
photos.
The photos are loaded from the local images directory, while the background
picture is from the data shipped with kivy in kivy/data/images/background.jpg.
The file pictures.kv describes the interface and the file shadow32.png is
the boarder to make the images looks like framed photographs. Finally,
the boarder to make the images looks like framed photographs. Finally,
the file android.txt is used to package the application for use with the
Kivy Launcher Android application.
Expand Down
6 changes: 3 additions & 3 deletions examples/demo/shadereditor/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
This provides a live editor for vertex and fragment editors.
You should see a window with two editable panes on the left
and a large kivy logo on the right. The top pane is the
Vertex shader and the bottom is the Fragment shader. The file shadereditor.kv
and a large kivy logo on the right.The top pane is the
Vertex shader and the bottom is the Fragment shader. The file shadereditor.kv
describes the interface.
On each keystroke to either shader, declarations are added and the shaders
are compiled. If there are no errors, the screen is updated. Otherwise,
are compiled. If there are no errors, the screen is updated. Otherwise,
the error is visible as logging message in your terminal.
'''

Expand Down
16 changes: 8 additions & 8 deletions examples/demo/showcase/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
Showcase of Kivy Features
=========================
This showcases many features of Kivy. You should see a
menu bar across the top with a demonstration area below. The
first demonstration is the accordion layout. You can see, but not
This showcases many features of Kivy. You should see a
menu bar across the top with a demonstration area below. The
first demonstration is the accordion layout. You can see, but not
edit, the kv language code for any screen by pressing the bug or
'show source' icon. Scroll through the demonstrations using the
'show source' icon. Scroll through the demonstrations using the
left and right icons in the top right or selecting from the menu
bar. This showcases dozens of features.
bar. This showcases dozens of features.
The file showcase.kv describes the main container, while each demonstration
pane is described in a separate .kv file in the data/screens directory.
The image data/background.png provides the gradient background while the
icons in data/icon directory are used in the control bar. The file
data/faust_github.jpg is used in the Scatter pane. The icons are
icons in data/icon directory are used in the control bar. The file
data/faust_github.jpg is used in the Scatter pane. The icons are
from `http://www.gentleface.com/free_icon_set.html` and licensed as
Creative Commons - Attribution and Non-commercial Use Only; they
sell a commercial license.
The file android.txt is used to package the application for use with the
Kivy Launcher Android application. For Android devices, you can
Kivy Launcher Android application. For Android devices, you can
copy/paste this directory into /sdcard/kivy/showcase on your Android device.
'''
Expand Down
12 changes: 6 additions & 6 deletions examples/demo/touchtracer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
Touch Tracer Line Drawing Demonstration
=======================================
The demonstrates tracking each touch registered to a device. You should
see a basic background image. When you press and hold the mouse, you
should see a cross-hairs with the coordinates written next to them. As
you drag, it leaves a trail. Additional information, like pressure,
The demonstrates tracking each touch registered to a device. You should
see a basic background image. When you press and hold the mouse, you
should see a cross-hairs with the coordinates written next to them. As
you drag, it leaves a trail. Additional information, like pressure,
will be shown if they are in your device's touch.profile.
This program specifies an icon, the file icon.png, in its App subclass.
It also uses the particle.png file as source for drawing the trails, which
white on transparent. The file touchtracer.kv describes the application.
white on transparent. The file touchtracer.kv describes the application.
The file android.txt is used to package the application for use with the
Kivy Launcher Android application. For Android devices, you can
Kivy Launcher Android application. For Android devices, you can
copy/paste this directory into /sdcard/kivy/touchtracer on your Android device.
'''
Expand Down
2 changes: 1 addition & 1 deletion examples/widgets/lists/list_composite.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(self, **kwargs):
# returned by this converter. The first three, text, size_hint_y,
# height are arguments for CompositeListItem. The cls_dicts list
# contains argument sets for each of the member widgets for this
# composite: ListItemButton and ListItemLabel.
# composite: ListItemButton and ListItemLabel.
args_converter = lambda row_index, rec: {
'text': rec['text'],
'size_hint_y': None,
Expand Down
1 change: 1 addition & 0 deletions kivy/tests/test_doc_gallery.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from doc.gallery import *


def test_parse_docstring_info():
assert 'error' in parse_docstring_info("No Docstring")
assert 'error' in parse_docstring_info("'''No Docstring Title'''")
Expand Down
2 changes: 1 addition & 1 deletion kivy/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def fib_100(self):
return b

def test_reify(self):
first = self.fib_100 # slow. self.fib_100 is a reify object making
first = self.fib_100 # slow. self.fib_100 is a reify object making
# the lazy call.
second = self.fib_100 # fast, self.fib_100 is a long.
assert first == second
Expand Down

0 comments on commit d9e2bbe

Please sign in to comment.