Changes On Branch d09e020ecf3e643d
Changes In Branch py3 Through [d09e020ecf] Excluding Merge-Ins
This is equivalent to a diff from 7ef1553f61 to d09e020ecf
2014-04-27
| ||
22:19 | Python3 support back into trunk check-in: 9ecea4fb26 user: mario tags: trunk | |
2014-04-08
| ||
22:16 | Add unicode() vs str() to compat2and3 check-in: 0458e0e0d1 user: mario tags: py3 | |
21:53 | fix dict + dict back into list join check-in: d09e020ecf user: mario tags: py3 | |
21:50 | more Python3 syntax fixes, introduce compat2and3 module check-in: 7911337325 user: mario tags: py3 | |
21:16 | rename http to ahttp to avoid conflict with Python3 modules, change .iteritems and xrange, remove same remaining plain print statements check-in: d3b1418bc6 user: mario tags: py3 | |
2014-04-07
| ||
00:33 | Move __print__ into config, add unified dbg.COLOR codes check-in: 7ef1553f61 user: mario tags: trunk | |
2014-04-06
| ||
02:16 | rename ui.xml to gtk2.xml for parity with gtk3.xml; Gtk3 suddenly works with gi 1.33 (well, lots of errors still, but main window ok) check-in: e7a0fb24c8 user: mario tags: trunk | |
Modified _package.epm from [d2e2c94cae] to [789f724b9f].
33 34 35 36 37 38 39 | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | - + | f 644 root root /usr/share/pixmaps/streamtuner2.png ./logo.png f 644 root root /usr/share/streamtuner2/gtk2.xml ./gtk2.xml f 644 root root /usr/share/streamtuner2/gtk3.xml ./gtk3.xml f 644 root root /usr/share/streamtuner2/pson.py ./pson.py #f 644 root root /usr/share/streamtuner2/processing.py ./processing.py f 644 root root /usr/share/streamtuner2/action.py ./action.py f 644 root root /usr/share/streamtuner2/config.py ./config.py |
Modified action.py from [fc0650246a] to [cd681feda2].
19 20 21 22 23 24 25 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | - + | # # # import re import os |
77 78 79 80 81 82 83 | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | - - + + | pass # exec wrapper @staticmethod def run(cmd): if conf.windows: |
Added ahttp.py version [11eca44aed].
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | # # encoding: UTF-8 # api: streamtuner2 # type: functions # title: http download / methods # description: http utility # version: 1.4 # # Provides a http GET method with gtk.statusbar() callback. # And a function to add trailings slashes on http URLs. # # from compat2and3 import urllib2, urlencode, urlparse, cookielib, StringIO, xrange from gzip import GzipFile from config import conf, __print__, dbg #-- url download --------------------------------------------- #-- chains to progress meter and status bar in main window feedback = None # sets either text or percentage, so may take two parameters def progress_feedback(*args): # use reset values if none given if not args: args = ["", 1.0] # send to main win if feedback: try: [feedback(d) for d in args] except: pass #-- GET def get(url, maxsize=1<<19, feedback="old"): __print__("GET", url) # statusbar info progress_feedback(url, 0.0) # read content = "" f = urllib2.urlopen(url) max = 222000 # mostly it's 200K, but we don't get any real information read_size = 1 # multiple steps while (read_size and len(content) < maxsize): # partial read add = f.read(8192) content = content + add read_size = len(add) # set progress meter progress_feedback(float(len(content)) / float(max)) # done # clean statusbar progress_feedback() # fin __print__(len(content)) return content #-- fix invalid URLs def fix_url(url): if url is None: url = "" if len(url): # remove whitespace url = url.strip() # add scheme if (url.find("://") < 0): url = "http://" + url # add mandatory path if (url.find("/", 10) < 0): url = url + "/" return url # default HTTP headers for AJAX/POST request default_headers = { "User-Agent": "streamtuner2/2.1 (X11; U; Linux AMD64; en; rv:1.5.0.1) like WinAmp/2.1 but not like Googlebot/2.1", #"Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.6) Gecko/20100628 Ubuntu/10.04 (lucid) Firefox/3.6.6", "Accept": "*/*;q=0.5, audio/*, url/*", "Accept-Language": "en-US,en,de,es,fr,it,*;q=0.1", "Accept-Encoding": "gzip,deflate", "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.1", "Keep-Alive": "115", "Connection": "keep-alive", #"Content-Length", "56", #"Cookie": "s_pers=%20s_getnr%3D1278607170446-Repeat%7C1341679170446%3B%20s_nrgvo%3DRepeat%7C1341679170447%3B; s_sess=%20s_cc%3Dtrue%3B%20s_sq%3Daolshtcst%252Caolsvc%253D%252526pid%25253Dsht%25252520%2525253A%25252520SHOUTcast%25252520Radio%25252520%2525257C%25252520Search%25252520Results%252526pidt%25253D1%252526oid%25253Dfunctiononclick%25252528event%25252529%2525257BshowMoreGenre%25252528%25252529%2525253B%2525257D%252526oidt%25253D2%252526ot%25253DDIV%3B; aolDemoChecked=1.849061", "Pragma": "no-cache", "Cache-Control": "no-cache", } # simulate ajax calls def ajax(url, post, referer=""): # request headers = default_headers headers.update({ "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", "X-Requested-With": "XMLHttpRequest", "Referer": (referer if referer else url), }) if type(post) == dict: post = urlencode(post) request = urllib2.Request(url, post, headers) # open url __print__( vars(request) ) progress_feedback(url, 0.2) r = urllib2.urlopen(request) # get data __print__( r.info() ) progress_feedback(0.5) data = r.read() progress_feedback() return data # http://techknack.net/python-urllib2-handlers/ class ContentEncodingProcessor(urllib2.BaseHandler): """A handler to add gzip capabilities to urllib2 requests """ # add headers to requests def http_request(self, req): req.add_header("Accept-Encoding", "gzip, deflate") return req # decode def http_response(self, req, resp): old_resp = resp # gzip if resp.headers.get("content-encoding") == "gzip": gz = GzipFile( fileobj=StringIO(resp.read()), mode="r" ) resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code) resp.msg = old_resp.msg # deflate if resp.headers.get("content-encoding") == "deflate": gz = StringIO( deflate(resp.read()) ) resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code) # 'class to add info() and geturl() methods to an open file.' resp.msg = old_resp.msg return resp # deflate support import zlib def deflate(data): # zlib only provides the zlib compress format, not the deflate format; try: # so on top of all there's this workaround: return zlib.decompress(data, -zlib.MAX_WBITS) except zlib.error: return zlib.decompress(data) #-- init for later use if urllib2: # config 1 handlers = [None, None, None] # base handlers[0] = urllib2.HTTPHandler() if conf.debug: handlers[0].set_http_debuglevel(3) # content-encoding handlers[1] = ContentEncodingProcessor() # store cookies at runtime cj = cookielib.CookieJar() handlers[2] = urllib2.HTTPCookieProcessor( cj ) # inject into urllib2 urllib2.install_opener( urllib2.build_opener(*handlers) ) # alternative function names AJAX=ajax POST=ajax GET=get URL=fix_url |
Modified channels/_generic.py from [f927301f5f] to [a20153b668].
19 20 21 22 23 24 25 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | - + | # adds the required gtk Widgets manually. # import gtk from mygtk import mygtk from config import conf, __print__, dbg |
145 146 147 148 149 150 151 | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | - + - + | self.gtk_cat = parent.get_widget(self.module+"_cat") # category tree self.display_categories() #mygtk.tree(self.gtk_cat, self.categories, title="Category", icon=gtk.STOCK_OPEN); # update column names |
179 180 181 182 183 184 185 | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | - + | # switch stream category, # load data, # update treeview content def load(self, category, force=False): # get data from cache or download |
233 234 235 236 237 238 239 | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | - + - + | # finds differences in new/old streamlist, marks deleted with flag def deleted_streams(self, new, old): diff = [] new = [row.get("url","http://example.com/") for row in new] for row in old: |
307 308 309 310 311 312 313 | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | - - + | if (self.shown != 55555): # if category tree is empty, initialize it if not self.categories: __print__(dbg.PROC, "first_show: reload_categories"); #self.parent.thread(self.reload_categories) |
Modified channels/basicch.py from [2ad035d297] to [c507665eb7].
8 9 10 11 12 13 14 | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + | # realaudio archive is not available anymore. # # Needs manual initialisation of categories first. # import re |
Modified channels/google.py from [3f0788927c] to [36a6ee6c2d].
47 48 49 50 51 52 53 | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | - + | # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. import re, os, gtk from channels import * from xml.sax.saxutils import unescape as entity_decode, escape as xmlentities |
Modified channels/internet_radio_org_uk.py from [4dcc6f65d4] to [6c77259f65].
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + | # from channels import * import re from config import conf, __print__, dbg |
Modified channels/jamendo.py from [0df05c5caf] to [9d3d3ac039].
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | - + | # api: streamtuner2 # title: jamendo browser # # For now this is really just a browser, doesn't utilizt the jamendo API yet. # Requires more rework of streamtuner2 list display to show album covers. # import re |
Modified channels/links.py from [692f83efe7] to [e2e193464a].
54 55 56 57 58 59 60 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | - + - + | bookmarks = parent.bookmarks if not bookmarks.streams.get(self.module): bookmarks.streams[self.module] = [] bookmarks.add_category(self.module) # collect links from channel plugins |
Modified channels/live365.py from [17860a6a46] to [10562bd5f9].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | - + | # api: st2 # title: live365 channel # # 2.0.9 fixed by Abhisek Sanyal # # streamtuner2 modules from config import conf from mygtk import mygtk |
Modified channels/modarchive.py from [bf829e8b72] to [a906bb560c].
8 9 10 11 12 13 14 | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + | # MOD files dodn't work with all audio players. And with the default # download method, it'll receive a .zip archive with embeded .mod file. # VLC in */* seems to work fine however. # import re |
Modified channels/musicgoal.py from [1d593a3fc6] to [faf1e3671e].
12 13 14 15 16 17 18 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | - + | # # st2 modules from config import conf from mygtk import mygtk |
Modified channels/myoggradio.py from [37210dae1e] to [6c4dac0144].
22 23 24 25 26 27 28 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | - + | from channels import * from config import conf from action import action import re import json |
Modified channels/punkcast.py from [6f838d457b] to [57433ea58f].
1 2 3 4 5 6 7 8 9 10 11 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - + | # api: streamtuner2 # title: punkcast listing # # # Disables itself per default. # ST1 looked prettier with random images within. # import re |
Modified channels/shoutcast.py from [3296716516] to [dd8d75b19e].
14 15 16 17 18 19 20 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | - + | # there's not a lot of information to fetch left. And this plugin is now back # to defaulting to regex extraction instead of HTML parsing & DOM extraction. # # # |
62 63 64 65 66 67 68 | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | - + - + | # sub-categories are queried per 'AJAX' def update_categories(self): html = http.get(self.base_url) self.categories = [] __print__( dbg.DATA, html ) # <h2>Radio Genres</h2> |
Modified channels/timer.py from [c50adafaed] to [73a61c99cb].
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | + | # # Programmed events are visible in "timer" under the "bookmarks" channel. Times # are stored in the description field, and can thus be edited. However, after editing # times manually, streamtuner2 must be restarted for the changes to take effect. # from config import __print__, dbg from channels import * import kronos from mygtk import mygtk from action import action import copy |
72 73 74 75 76 77 78 | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | - + | "timer_cancel": lambda w,*a: self.parent.timer_dialog.hide() or 1, }) # prepare spool self.sched = kronos.ThreadedScheduler() for row in self.streams: try: self.queue(row) |
Modified channels/tv.py from [e09d4b20ac] to [2d1fa5a0ac].
14 15 16 17 18 19 20 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | - + | # Pasing with lxml is dead simple in this case, so we use etree directly # instead of PyQuery. Like with the Xiph plugin, downloaded streams are simply # stored in .streams["all"] pseudo-category. # # icon: http://cemagraphics.deviantart.com/art/Little-Tv-Icon-96461135 from channels import * |
Modified channels/xiph.py from [6bbc72e8d5] to [e14b45bb99].
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | - + | # # streamtuner2 modules from config import conf from mygtk import mygtk |
Modified cli.py from [a682821821] to [ea53579a96].
13 14 15 16 17 18 19 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | - + | # # # import sys #from channels import * |
Added compat2and3.py version [022ad69c97].
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | # # encoding: UTF-8 # api: python # type: functions # title: Python2 and Python3 compatibility # version: 0.1 # # Renames some Python3 modules into their Py2 equivalent. # Slim local alternative to `six` module. # import sys # Python 2 if sys.version_info < (3,0): # version tags PY2 = 1 PY3 = 0 # basic functions xrange = xrange range = xrange # urllib modules import urllib import urllib2 from urllib import urlencode import urlparse import cookielib # filesys from StringIO import StringIO # Python 3 else: # version tags PY2 = 0 PY3 = 1 # basic functions xrange = range # urllib modules import urllib.request as urllib import urllib.request as urllib2 from urllib.parse import urlencode import urllib.parse as urlparse from http import cookiejar as cookielib # filesys from io import StringIO |
Modified favicon.py from [f5d4a162a1] to [983556d34c].
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | - + - - + | always_google = 1 # use favicon service for speed only_google = 1 # if that fails, try our other/slower methods? delete_google_stub = 1 # don't keep placeholder images google_placeholder_filesizes = (726,896) import os, os.path |
85 86 87 88 89 90 91 | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | - + - + | # extract first title parts title = rx_t.search(row["title"]) if title: title = title.group(0).replace(" ", "%20") # do a google search |
191 192 193 194 195 196 197 | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | - + - + | # try: # URL download r = urllib.urlopen(favicon) headers = r.info() # abort on if r.getcode() >= 300: |
232 233 234 235 236 237 238 | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | - + | favicon = "".join(rx.findall(html)) # url or if favicon.startswith("http://"): None # just /pathname else: |
262 263 264 265 266 267 268 | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | - + | # import operator import struct try: from PIL import BmpImagePlugin, PngImagePlugin, Image |
Deleted http.py version [0d4dcfee94].
|
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Modified kronos.py from [6ae12b7565] to [24a87e43ef].
270 271 272 273 274 275 276 | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | - + | self.sched.queue[:] = [] def _run(self): # Low-level run method to do the actual scheduling loop. while self.running: try: self.sched.run() |
294 295 296 297 298 299 300 | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | - + | self.args=args self.kw=kw def __call__(self, schedulerref): """Execute the task action in the scheduler's thread.""" try: self.execute() |
462 463 464 465 466 467 468 | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | - + | self.reschedule(schedulerref()) def threadedcall(self): # This method is run within its own thread, so we have to # do the execute() call and exception handling here. try: self.execute() |
529 530 531 532 533 534 535 | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | - + | def __call__(self, schedulerref): """Execute the task action in its own process.""" pid = os.fork() if pid == 0: # we are the child try: self.execute() |
Modified mygtk.py from [98fa2cab88] to [91f32ed114].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - + | # # encoding: UTF-8 # api: python # type: functions # title: mygtk helper functions # description: simplify usage of some gtk widgets |
25 26 27 28 29 30 31 32 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | + + + + + + + + + + + + + + - + - - + - - + + - + - - - - | # debug from config import __print__, dbg # filesystem import os.path import copy import sys if sys.version_info[0] >= 3: unicode = str # gtk version ver = 2 # 2=gtk2, 3=gtk3 if "--gtk3" in sys.argv: ver = 3 if sys.version_info >= (3, 0): ver = 3 |
103 104 105 106 107 108 109 | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | - + - + | col.set_resizable(True) # width if (desc[1] > 0): col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) col.set_fixed_width(desc[1]) # loop through cells |
145 146 147 148 149 150 151 | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | - + | # add data? if (entries): #- expand datamap vartypes = [] #(str, str, bool, str, int, int, gtk.gdk.Pixbuf, str, int) rowmap = [] #["title", "desc", "bookmarked", "name", "count", "max", "img", ...] if (not rowmap): for desc in datamap: |
Modified pq.py from [774d8a07cf] to [9ad9a3d426].
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | - + | try: from pyquery import PyQuery as pq # pq.each_pq = lambda self,func: self.each( lambda i,html: func( pq(html, parser="html") ) ) |
Modified st2.py from [0b9e0b6b81] to [3e5e378842].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | - + | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: directory browser for internet radio / audio streams # depends: gtk, pygtk, xml.dom.minidom, threading, lxml, pyquery, kronos |
96 97 98 99 100 101 102 | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | - + | # gtk modules from mygtk import pygtk, gtk, gobject, ui_file, mygtk # custom modules from config import conf # initializes itself, so all conf.vars are available right away from config import __print__, dbg |
166 167 168 169 170 171 172 | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | - + | self.current_channel = self.current_channel_gtk() try: self.channel().first_show() except: __print__(dbg.INIT, "main.__init__: current_channel.first_show() initialization error") # bind gtk/glade event names to functions gui_startup(19/20.0) |
216 217 218 219 220 221 222 | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | - + - + - + | "search_google": search.google, "search_cancel": search.cancel, "true": lambda w,*args: True, "streamedit_open": streamedit.open, "streamedit_save": streamedit.save, "streamedit_new": streamedit.new, "streamedit_cancel": streamedit.cancel, |
521 522 523 524 525 526 527 | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | + - + + + | gtk.rc_parse(f) pass # end application and gtk+ main loop def gtk_main_quit(self, widget, *x): if conf.auto_save_appstate: try: # doesn't work with gtk3 yet (probably just hooking at the wrong time) |
1149 1150 1151 1152 1153 1154 1155 | 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 | - + - + | #-- run main --------------------------------------------- if __name__ == "__main__": #-- global configuration settings "conf = Config()" # already happened with "from config import conf" # graphical |