Check-in [9ecea4fb26]
Overview
Comment: | Python3 support back into trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9ecea4fb266e5a1a059b03f080790da9 |
User & Date: | mario on 2014-04-27 22:19:12 |
Other Links: | manifest | tags |
Context
2014-04-27
| ||
22:48 | Fully replace ahttp.ajax with ahttp.get() wrapper check-in: b9af78503d user: mario tags: trunk | |
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 | |
2014-04-07
| ||
00:33 | Move __print__ into config, add unified dbg.COLOR codes check-in: 7ef1553f61 user: mario tags: trunk | |
Changes
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 [cb21b9f4ec].
︙ | |||
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 | - + - + - | 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 |
︙ | |||
110 111 112 113 114 115 116 | 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 | - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | f 644 root root /usr/share/doc/streamtuner2/help/timer.page ./help/timer.page d 755 root root /usr/share/doc/streamtuner2/help/img - f 644 root root /usr/share/doc/streamtuner2/help/img/categories.png ./help/img/categories.png f 644 root root /usr/share/doc/streamtuner2/help/img/channels.png ./help/img/channels.png f 644 root root /usr/share/doc/streamtuner2/help/img/logo.png ./help/img/logo.png f 644 root root /usr/share/doc/streamtuner2/help/img/mainwindow2.svg ./help/img/mainwindow2.svg f 644 root root /usr/share/doc/streamtuner2/help/img/streams.png ./help/img/streams.png |
︙ |
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" |
Modified ahttp.py from [0d4dcfee94] to [4f43fe032b].
1 2 3 4 5 6 | 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 | - + - - - - - - + + + - - - - - - - - + + + + - - + + + + + + + + + + + + + + + - - + + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + - - + - + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | # # encoding: UTF-8 # api: streamtuner2 # type: functions # title: http download / methods # description: http utility |
Modified bundle/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() |
︙ |
Added bundle/requests/__init__.py version [117eb3e898].
|
Added bundle/requests/adapters.py version [5074065bc8].