summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mayo <aklhfex@gmail.com>2017-08-12 11:27:23 +0100
committerJiří Techet <techet@gmail.com>2017-08-22 23:17:52 +0200
commit2748a76369e91a6c5002b8e17edcb7b8be739e65 (patch)
tree41cc6c38f0e06e21fe7891df6a0259893474cde4
parent4f614845e7f2639138f9fbb24225e6d89da44683 (diff)
downloadlibchamplain-2748a76369e91a6c5002b8e17edcb7b8be739e65.tar.gz
Implement flake8 suggestions for Python demos
https://bugzilla.gnome.org/show_bug.cgi?id=786195
-rwxr-xr-xdemos/keyboard-mapping.py13
-rwxr-xr-xdemos/launcher-gtk.py9
-rwxr-xr-xdemos/mapbox.py4
-rwxr-xr-xdemos/minimal.py3
-rwxr-xr-xdemos/polygons.py6
5 files changed, 17 insertions, 18 deletions
diff --git a/demos/keyboard-mapping.py b/demos/keyboard-mapping.py
index 50eb623..45925b5 100755
--- a/demos/keyboard-mapping.py
+++ b/demos/keyboard-mapping.py
@@ -9,7 +9,7 @@ import gi
gi.require_version('GtkChamplain', '0.12')
gi.require_version('GtkClutter', '1.0')
from gi.repository import GtkClutter
-from gi.repository import GObject, Gtk, Gdk, GtkChamplain
+from gi.repository import Gtk, Gdk, GtkChamplain
class KeyboardMapping:
@@ -30,17 +30,17 @@ class KeyboardMapping:
def on_key_press(self, widget, ev):
deltax = self.widget.get_allocation().width / 4
deltay = self.widget.get_allocation().height / 4
- if ev.keyval == Gdk.KEY_Left:
+ if ev.keyval == Gdk.KEY_Left:
self.scroll(-deltax, 0)
- elif ev.keyval == Gdk.KEY_Right:
+ elif ev.keyval == Gdk.KEY_Right:
self.scroll(deltax, 0)
- elif ev.keyval == Gdk.KEY_Up:
+ elif ev.keyval == Gdk.KEY_Up:
self.scroll(0, -deltay)
- elif ev.keyval == Gdk.KEY_Down:
+ elif ev.keyval == Gdk.KEY_Down:
self.scroll(0, deltay)
elif ev.keyval == Gdk.KEY_plus or ev.keyval == Gdk.KEY_KP_Add:
self.view.zoom_in()
- elif ev.keyval == Gdk.KEY_minus or ev.keyval == Gdk.KEY_KP_Subtract:
+ elif ev.keyval == Gdk.KEY_minus or ev.keyval == Gdk.KEY_KP_Subtract:
self.view.zoom_out()
else:
return False
@@ -59,6 +59,7 @@ class KeyboardMapping:
self.view.center_on(lat, lon)
#self.view.go_to(lat, lon)
+
if __name__ == "__main__":
KeyboardMapping()
Gtk.main()
diff --git a/demos/launcher-gtk.py b/demos/launcher-gtk.py
index 1035495..1fb402d 100755
--- a/demos/launcher-gtk.py
+++ b/demos/launcher-gtk.py
@@ -6,10 +6,11 @@ gi.require_version('Champlain', '0.12')
gi.require_version('GtkChamplain', '0.12')
gi.require_version('GtkClutter', '1.0')
from gi.repository import GtkClutter, Clutter
-GtkClutter.init([]) # Must be initialized before importing those:
+GtkClutter.init([]) # Must be initialized before importing those:
from gi.repository import GObject, Gtk, Champlain, GtkChamplain, Pango
-import os, sys
+import os
+import sys
os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
class LauncherGTK:
@@ -137,7 +138,7 @@ class LauncherGTK:
iter = widget.get_active_iter()
id = model.get_value(iter, 0)
map_source_factory = Champlain.MapSourceFactory.dup_default()
- source = map_source_factory.create_cached_source(id);
+ source = map_source_factory.create_cached_source(id)
self.view.set_property("map-source", source)
def map_zoom_changed(self, widget, value):
@@ -157,7 +158,6 @@ class LauncherGTK:
print("Montreal was clicked\n")
return True
-
def create_marker_layer(self, view):
orange = Clutter.Color.new(0xf3, 0x94, 0x07, 0xbb)
layer = Champlain.MarkerLayer()
@@ -201,6 +201,7 @@ class LauncherGTK:
layer.show()
return layer
+
if __name__ == "__main__":
GObject.threads_init()
LauncherGTK()
diff --git a/demos/mapbox.py b/demos/mapbox.py
index 6921ca3..badd0bb 100755
--- a/demos/mapbox.py
+++ b/demos/mapbox.py
@@ -10,7 +10,7 @@ gi.require_version('Champlain', '0.12')
gi.require_version('GtkChamplain', '0.12')
gi.require_version('GtkClutter', '1.0')
from gi.repository import GtkClutter
-from gi.repository import GObject, Gtk, Champlain, GtkChamplain
+from gi.repository import Gtk, Champlain, GtkChamplain
ACCESS_TOKEN = "PUT YOUR ACCESS TOKEN HERE!!!"
@@ -72,5 +72,3 @@ window.add(widget)
window.show_all()
Gtk.main()
-
-
diff --git a/demos/minimal.py b/demos/minimal.py
index 03a9b12..da3cc32 100755
--- a/demos/minimal.py
+++ b/demos/minimal.py
@@ -9,7 +9,7 @@ import gi
gi.require_version('GtkChamplain', '0.12')
gi.require_version('GtkClutter', '1.0')
from gi.repository import GtkClutter
-from gi.repository import GObject, Gtk, GtkChamplain
+from gi.repository import Gtk, GtkChamplain
GtkClutter.init([])
@@ -23,4 +23,3 @@ window.add(widget)
window.show_all()
Gtk.main()
-
diff --git a/demos/polygons.py b/demos/polygons.py
index 8344512..d06e416 100755
--- a/demos/polygons.py
+++ b/demos/polygons.py
@@ -33,7 +33,7 @@ def zoom_out(widget, event, view):
def make_button(text):
black = Clutter.Color.new(0x00, 0x00, 0x00, 0xff)
white = Clutter.Color.new(0xff, 0xff, 0xff, 0xff)
-
+
button = Clutter.Actor()
button_bg = Clutter.Actor()
@@ -81,7 +81,7 @@ if __name__ == '__main__':
buttons.add_child(button)
button.set_reactive(True)
(width, height) = button.get_size()
- total_width += width + PADDING;
+ total_width += width + PADDING
#button.connect('button-release-event', zoom_in, view)
button.connect('button-release-event', zoom_in, view)
@@ -110,7 +110,7 @@ if __name__ == '__main__':
dash = [6, 2]
layer.set_dash(dash)
-
+
# Draw a path
layer = Champlain.PathLayer()
append_point(layer, 45.1386, -73.9196)