Changes On Branch 3c5ead99ef57d319
Changes In Branch py3 Through [3c5ead99ef] Excluding Merge-Ins
This is equivalent to a diff from 7ef1553f61 to 3c5ead99ef
2014-04-27
| ||
22:19 | Python3 support back into trunk check-in: 9ecea4fb26 user: mario tags: trunk | |
21:46 | Include `requests`, which is now used in ahttp in favour of urllib2 Leaf check-in: 9e0065d508 user: mario tags: py3 | |
19:23 | create bundle/ subdirectory for included python libs check-in: 3c5ead99ef user: mario tags: py3 | |
2014-04-18
| ||
00:06 | Some typos fixed in the docs. check-in: edf5668ef9 user: mario tags: py3 | |
2014-04-08
| ||
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 PKG-INFO from [cf54822d4c] to [90430401a4].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + - + | Metadata-Version: 1.0 Name: streamtuner2 |
Modified _package.epm from [d2e2c94cae] to [b1b09d1674].
︙ | |||
29 30 31 32 33 34 35 | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | - + - + - + | f 755 root root /usr/bin/streamtuner2 ./st2.py f 644 root root /usr/share/applications/streamtuner2.desktop ./streamtuner2.desktop d 755 root root /usr/share/streamtuner2 - f 644 root root /usr/share/streamtuner2/streamtuner2.png ./streamtuner2.png 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 |
︙ |
Modified action.py from [fc0650246a] to [a3c14ebdbb].
︙ | |||
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 |
︙ | |||
43 44 45 46 47 48 49 | 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 | - + - + - + - + - - + + - + | # media formats mf = {"mp3":"audio/mp3", "ogg":"audio/ogg", "aac":"audio/aac"} # web @staticmethod def browser(url): |
︙ | |||
187 188 189 190 191 192 193 | 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | - + | return url # download a .pls resource and extract urls @staticmethod def pls(url): text = http.get(url) |
︙ | |||
222 223 224 225 226 227 228 | 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 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | - + - + - + - + | # use shoutcast unique stream id if available stream_id = re.search("http://.+?/.*?(\d+)", pls, re.M) stream_id = stream_id and stream_id.group(1) or "XXXXXX" try: channelname = main.current_channel except: channelname = "unknown" |
Added ahttp.py version [a715d3203a].