Style Guide Fixes:Pep8

Author: akshayaurora

kivy/__init__.py

@@ -183,13 +183,16 @@ def kivy_usage():
 kivy_options = {
     'window': ('egl_rpi', 'pygame', 'sdl', 'x11', 'sdl2'),
     'text': ('pil', 'pygame', 'sdlttf', 'sdl2'),
-    'video': ('gstplayer', 'ffmpeg', 'ffpyplayer', 'gi', 'pygst', 'pyglet',
-              'null'),
+    'video': (
+        'gstplayer', 'ffmpeg', 'ffpyplayer', 'gi', 'pygst', 'pyglet',
+        'null'),
     'audio': ('gstplayer', 'pygame', 'gi', 'pygst', 'ffpyplayer', 'sdl'),
     'image': ('tex', 'imageio', 'dds', 'gif', 'pil', 'pygame', 'ffpy', 'sdl2'),
     'camera': ('opencv', 'gi', 'pygst', 'videocapture', 'avfoundation'),
     'spelling': ('enchant', 'osxappkit', ),
-    'clipboard': ('android', 'winctypes', 'dbusklipper', 'nspaste', 'pygame', 'sdl2', 'dummy'), }
+    'clipboard': (
+        'android', 'winctypes', 'dbusklipper', 'nspaste', 'pygame',
+        'sdl2', 'dummy'), }
 
 # Read environment
 for option in kivy_options:

kivy/adapters/__init__.py

@@ -7,7 +7,7 @@
 An adapter is a mediating controller-type class that processes and presents
 data for use in views. It does this by generating models, generally lists of
 :class:`~kivy.uix.listview.SelectableView` items, that are consumed and
-presented by views. Views are top-level widgets, such as a 
+presented by views. Views are top-level widgets, such as a
 :class:`~kivy.uix.listview.ListView`, that allow users to scroll through
 and (optionally) interact with your data.
 
@@ -35,7 +35,7 @@
   and your data. It manages the creation of the view elements for the model
   using the args_converter to prepare the contructor arguments for your
   cls/template view items.
-  
+
   The base :class:`Adapter` is subclassed by the
   :class:`SimpleListAdapter` and :class:`ListAdapter`. The :class:`DictAdapter`
   is a more advanced and flexible subclass of :class:`ListAdapter`.
@@ -66,7 +66,7 @@
   your data items create a corresponding view subitem (the cls or template)
   presented in a list by the View. The base :class:`AbstractView` currently has
   one concrete implementation: the :class:`ListView`.
-  
+
     :doc:`api-kivy.uix.abstractview`,
     :doc:`api-kivy.uix.listview`.
 

kivy/adapters/adapter.py

@@ -47,6 +47,7 @@
 from kivy.factory import Factory
 from kivy.compat import string_types
 
+
 class Adapter(EventDispatcher):
     '''An :class:`~kivy.adapters.adapter.Adapter` is a bridge between data and
     an :class:`~kivy.uix.abstractview.AbstractView` or one of its subclasses,

kivy/adapters/args_converters.py

@@ -45,7 +45,7 @@
 Please see the `list_composite.py <https://github.com/\
 kivy/kivy/tree/master/examples/widgets/lists/list_composite.py>`_ for a complete
 example.
-                                            
+
 '''
 list_item_args_converter = lambda row_index, x: {'text': x,
                                                  'size_hint_y': None,

kivy/adapters/listadapter.py

@@ -130,9 +130,9 @@ class ListAdapter(Adapter, EventDispatcher):
     the data. You could accomplish the same functionality by writing code to
     operate on list selection, but having selection stored in the data
     ListProperty might prove convenient in some cases.
-    
+
     .. note::
-    
+
         This setting should be set to True if you wish to initialize the view
         with item views already selected.
 

kivy/clock.py

@@ -8,7 +8,7 @@
 `dt` argument::
 
     # dt means delta-time
-    def my_callback(dt): 
+    def my_callback(dt):
         pass
 
     # call my_callback every 0.5 seconds

kivy/config.py

@@ -35,7 +35,7 @@
     The ConfigParser should work correctly with utf-8 now. The values are
     converted from ascii to unicode only when needed. The method get() returns
     utf-8 strings.
-    
+
 .. _configuration-tokens:
 
 Available configuration tokens
@@ -227,7 +227,7 @@
 .. note::
 
     These options control only the initalization of the app and a restart
-    is required for value changes to take effect.    
+    is required for value changes to take effect.
 
 .. versionchanged:: 1.9.0
     `borderless` has been added to the graphics section.

kivy/core/audio/__init__.py

@@ -26,7 +26,7 @@
 .. note::
 
     The core audio library does not support recording audio. If you require
-    this functionality, please refer to the 
+    this functionality, please refer to the
     `audiostream <https://github.com/kivy/audiostream>`_ extension.
 
 '''

kivy/core/clipboard/__init__.py

@@ -53,10 +53,10 @@ def get_types(self):
     def _ensure_clipboard(self):
         ''' Ensure that the clipboard has been properly initialised.
         '''
-        
+
         if hasattr(self, '_clip_mime_type'):
             return
-        
+
         if platform == 'win':
             self._clip_mime_type = 'text/plain;charset=utf-8'
             # windows clipboard uses a utf-16 encoding
@@ -128,7 +128,8 @@ def _paste(self):
         _clipboards.append(
             ('winctypes', 'clipboard_winctypes', 'ClipboardWindows'))
     elif _platform == 'linux':
-        _clipboards.append(('dbusklipper', 'clipboard_dbusklipper', 'ClipboardDbusKlipper'))
+        _clipboards.append(
+            ('dbusklipper', 'clipboard_dbusklipper', 'ClipboardDbusKlipper'))
 
     _clipboards.append(
         ('pygame', 'clipboard_pygame', 'ClipboardPygame'))

kivy/core/clipboard/clipboard_pygame.py

@@ -30,11 +30,15 @@ def init(self):
 
     def get(self, mimetype='text/plain'):
         self.init()
+<<<<<<< Updated upstream
         text = pygame.scrap.get(mimetype)
         if PY2:
             text = text.encode('utf-8')
 
         return text
+=======
+        return pygame.scrap.get(mimetype).encode('utf-8')
+>>>>>>> Stashed changes
 
     def put(self, data, mimetype='text/plain'):
         self.init()

kivy/core/clipboard/clipboard_sdl2.py

@@ -11,7 +11,8 @@
     raise SystemError('unsupported platform for sdl2 clipboard')
 
 try:
-    from kivy.core.clipboard._clipboard_sdl2 import _get_text, _has_text, _set_text
+    from kivy.core.clipboard._clipboard_sdl2 import (
+        _get_text, _has_text, _set_text)
 except ImportError:
     raise SystemError('extension not compiled?')
 

kivy/core/text/__init__.py

@@ -554,7 +554,8 @@ def render(self, real=False):
             # all text will be stripped by default. unicode NO-BREAK SPACE
             # characters will be preserved, so we replace the leading and
             # trailing spaces with \u00a0
-            text = text.decode('utf8', errors=options['unicode_errors']) if isinstance(text, bytes) else text
+            text = text.decode('utf8', errors=options['unicode_errors'])\
+                if isinstance(text, bytes) else text
             lspace = len(text) - len(text.lstrip())
             rspace = len(text) - len(text.rstrip())
             text = (u'\u00a0' * lspace) + text.strip() + (u'\u00a0' * rspace)

kivy/core/text/markup.py

@@ -437,7 +437,7 @@ def _real_render(self):
                 anchor = options['_anchor']
                 if anchor is not None:
                     if not anchor in anchors:
-                       anchors[anchor] = (x, y)
+                        anchors[anchor] = (x, y)
                 x += word.lw
             y += lh
 

kivy/core/text/text_sdl2.py

@@ -18,11 +18,11 @@ class LabelSDL2(LabelBase):
     def _get_font_id(self):
         if PY2:
             try:
-                return '|'.join([unicode(self.options[x]) for x \
+                return '|'.join([unicode(self.options[x]) for x
                     in ('font_size', 'font_name_r', 'bold', 'italic')])
             except UnicodeDecodeError:
                 pass
-        return '|'.join([str(self.options[x]) for x \
+        return '|'.join([str(self.options[x]) for x
             in ('font_size', 'font_name_r', 'bold', 'italic')])
 
     def get_extents(self, text):

kivy/core/video/video_ffpyplayer.py

@@ -177,9 +177,12 @@ def _redraw(self, *args):
             if self._out_fmt == 'yuv420p':
                 w2 = int(w / 2)
                 h2 = int(h / 2)
-                self._tex_y = Texture.create(size=(w, h), colorfmt='luminance')
-                self._tex_u = Texture.create(size=(w2, h2), colorfmt='luminance')
-                self._tex_v = Texture.create(size=(w2, h2), colorfmt='luminance')
+                self._tex_y = Texture.create(
+                    size=(w, h), colorfmt='luminance')
+                self._tex_u = Texture.create(
+                    size=(w2, h2), colorfmt='luminance')
+                self._tex_v = Texture.create(
+                    size=(w2, h2), colorfmt='luminance')
                 self._fbo = fbo = Fbo(size=self._size)
                 with fbo:
                     BindTexture(texture=self._tex_u, index=1)
@@ -205,7 +208,8 @@ def _redraw(self, *args):
                 self._tex_u.blit_buffer(du, colorfmt='luminance')
                 self._tex_v.blit_buffer(dv, colorfmt='luminance')
             else:
-                self._texture.blit_buffer(img.to_memoryview()[0], colorfmt='rgba')
+                self._texture.blit_buffer(
+                    img.to_memoryview()[0], colorfmt='rgba')
 
             self._fbo.ask_update()
             self._fbo.draw()

kivy/core/video/video_gstplayer.py

@@ -125,7 +125,8 @@ def _update_texture(self, buf):
             self.dispatch('on_load')
 
         if self._texture:
-            self._texture.blit_buffer(data, size=(width, height), colorfmt='rgb')
+            self._texture.blit_buffer(
+                data, size=(width, height), colorfmt='rgb')
 
     def _get_uri(self):
         uri = self.filename

kivy/core/window/__init__.py

@@ -406,16 +406,16 @@ def _set_rotation(self, x):
     softinput_mode = OptionProperty('', options=('', 'pan', 'scale', 'resize'))
     '''This specifies the behavior of window contents on display of soft
     keyboard on mobile platform. Can be one of '', 'pan', 'scale', 'resize'.
-    
+
     When '' The main window is left as it is allowing the user to use
     :attr:`keyboard_height` to manage the window contents the way they want.
-    
+
     when 'pan' The main window pans moving the bottom part of the window to be
     always on top of the keyboard.
-    
+
     when 'resize' The window is resized and the contents scaled to fit the
     remaining space.
-    
+
     ..versionadded::1.9.0
 
     :attr:`softinput_mode` is a :class:`OptionProperty` defaults to None.
@@ -509,8 +509,8 @@ def __self__(self):
                   'on_motion', 'on_touch_down', 'on_touch_move', 'on_touch_up',
                   'on_mouse_down', 'on_mouse_move', 'on_mouse_up',
                   'on_keyboard', 'on_key_down', 'on_key_up', 'on_dropfile',
-                  'on_request_close', 'on_joy_axis', 'on_joy_hat', 'on_joy_ball',
-                  'on_joy_button_down', "on_joy_button_up")
+                  'on_request_close', 'on_joy_axis', 'on_joy_hat',
+                  'on_joy_ball', 'on_joy_button_down', "on_joy_button_up")
 
     def __new__(cls, **kwargs):
         if cls.__instance is None:
@@ -908,7 +908,6 @@ def update_viewport(self):
         w2, h2 = w / 2., h / 2.
         r = radians(self.rotation)
 
-
         x, y = 0, 0
         _h = h
         if smode:
@@ -1038,6 +1037,7 @@ def on_joy_button_down(self, stickid, buttonid):
 
         .. versionadded:: 1.9.0'''
         pass
+
     def on_joy_button_up(self, stickid, buttonid):
         '''Event called when a joystick has a button released
 

kivy/core/window/window_pygame.py

@@ -79,7 +79,7 @@ def create_window(self, *largs):
 
         if self._fake_fullscreen:
             if not self.borderless:
-                self.fullscreen = self._fake_fullscreen  = False
+                self.fullscreen = self._fake_fullscreen = False
             elif not self.fullscreen or self.fullscreen == 'auto':
                 self.borderless = self._fake_fullscreen = False
 

kivy/input/providers/androidjoystick.py

@@ -95,8 +95,8 @@ def update(self, dispatch_fn):
                 elif pressed:
                     touch = touches[jid]
                     # avoid same touch position
-                    if touch.sx == x and touch.sy == y \
-                    and touch.pressure == pressure:
+                    if (touch.sx == x and touch.sy == y
+                        and touch.pressure == pressure):
                         continue
                     touch.move([x, y, pressure, radius])
                     dispatch_fn('update', touch)

kivy/input/providers/hidinput.py

@@ -466,7 +466,8 @@ def process_as_multitouch(tv_sec, tv_usec, ev_type,
                     elif ev_code == ABS_MT_TOUCH_MINOR:
                         point['size_h'] = ev_value
 
-            def process_as_mouse_or_keyboard(tv_sec, tv_usec, ev_type, ev_code, ev_value):
+            def process_as_mouse_or_keyboard(
+                tv_sec, tv_usec, ev_type, ev_code, ev_value):
 
                 if ev_type == EV_SYN:
                     if ev_code == SYN_REPORT:
@@ -521,22 +522,35 @@ def process_as_mouse_or_keyboard(tv_sec, tv_usec, ev_type, ev_code, ev_value):
                                 point['_avoid'] = True
                     else:
                         if ev_value == 1:
-                            l = keyboard_keys[ev_code][-1 if 'shift' in Window._modifiers else 0]
+                            l = keyboard_keys[ev_code][-1
+                                if 'shift' in Window._modifiers else 0]
                             if l == 'shift':
                                 Window._modifiers.append('shift')
                             print(ev_code, l)
-                            Window.dispatch('on_key_down', Keyboard.keycodes[l.lower()], ev_code, keys_str.get(l, l), Window._modifiers)
+                            Window.dispatch(
+                                'on_key_down',
+                                Keyboard.keycodes[l.lower()],
+                                ev_code, keys_str.get(l, l),
+                                Window._modifiers)
                         if ev_value == 0:
-                            l = keyboard_keys[ev_code][-1 if 'shift' in Window._modifiers else 0]
-                            Window.dispatch('on_key_up', Keyboard.keycodes[l.lower()], ev_code, keys_str.get(l, l), Window._modifiers)
+                            l = keyboard_keys[ev_code][-1
+                                if 'shift' in Window._modifiers else 0]
+                            Window.dispatch(
+                                'on_key_up',
+                                Keyboard.keycodes[l.lower()],
+                                ev_code,
+                                keys_str.get(l, l),
+                                Window._modifiers)
                             if l == 'shift':
                                 Window._modifiers.remove('shift')
                         # if ev_value == 2:
                         #     Window.dispatch('on_key_down', ev_code)
 
             def process(points):
                 if not is_multitouch:
-                    Window.mouse_pos = points[0]['x'] * Window.width, points[0]['y'] * Window.height
+                    Window.mouse_pos = (
+                        points[0]['x'] * Window.width,
+                        points[0]['y'] * Window.height)
 
                 actives = [args['id']
                            for args in points
@@ -636,8 +650,10 @@ def normalize(value, vmin, vmax):
                                     '<%s> range ABS Y position is %d - %d' % (
                                         device_name, abs_min, abs_max))
                     elif y == ABS_PRESSURE:
-                        range_min_abs_pressure = drs('min_abs_pressure', abs_min)
-                        range_max_abs_pressure = drs('max_abs_pressure', abs_max)
+                        range_min_abs_pressure = drs(
+                            'min_abs_pressure', abs_min)
+                        range_max_abs_pressure = drs(
+                            'max_abs_pressure', abs_max)
                         Logger.info('HIDMotionEvent: ' +
                                     '<%s> range ABS pressure is %d - %d' % (
                                         device_name, abs_min, abs_max))

kivy/modules/inspector.py

@@ -422,7 +422,8 @@ def show_widget_info(self):
             try:
                 widget.bind(**{key: partial(
                     self.update_node_content, weakref.ref(node))})
-            except: pass
+            except:
+                pass
             treeview.add_node(node)
 
     def update_node_content(self, node, *l):

kivy/modules/touchring.py

@@ -17,8 +17,9 @@
         Opacity of the image.
     `show_cursor`: boolean, default to False
         .. versionadded:: 1.8.0
-    `cursor_image`: str, defaults to 'atlas://data/images/defaulttheme/slider_cursor'
-        Image used to represent the cursor if displayed
+    `cursor_image`: str, defaults to
+        'atlas://data/images/defaulttheme/slider_cursor' Image used to
+        represent the cursor if displayed
         .. versionadded:: 1.8.0
     `cursor_size`: tuple, defaults to (None, None)
         Apparent size of the mouse cursor, if displayed, default value

kivy/network/urlrequest.py

@@ -502,8 +502,9 @@ def on_error(req, error):
         pprint('Got an error:')
         pprint(error)
 
-    req = UrlRequest('http://en.wikipedia.org/w/api.php?format=json&action=query&titles=Kivy&prop=revisions&rvprop=content',
-                     on_success, on_error)
+    req = UrlRequest('http://en.wikipedia.org/w/api.php?format'
+        '=json&action=query&titles=Kivy&prop=revisions&rvprop=content',
+        on_success, on_error)
     while not req.is_finished:
         sleep(1)
         Clock.tick()