]>
Commit | Line | Data |
---|---|---|
81675874 | 1 | #/usr/bin/python |
2 | ||
feb02477 | 3 | import logging |
401827c2 | 4 | import itertools |
81675874 | 5 | import os.path |
c01ad253 | 6 | import phonenumbers |
e96e445b | 7 | import phonenumbers.geocoder |
81675874 | 8 | import tornado.locale |
a49b5422 | 9 | import tornado.options |
81675874 | 10 | import tornado.web |
11 | ||
a95c2f97 | 12 | import ipfire |
574a88c7 | 13 | import ipfire.countries |
440aba92 | 14 | from .. import util |
feb02477 | 15 | |
11347e46 | 16 | from .handlers import * |
81675874 | 17 | |
08df6527 | 18 | from . import auth |
12e5de7e | 19 | from . import blog |
f301d952 | 20 | from . import boot |
c7bcb9ca | 21 | from . import donate |
e77cd04c | 22 | from . import download |
96c9bb79 | 23 | from . import fireinfo |
699a0911 | 24 | from . import iuse |
f5b01fc2 | 25 | from . import location |
95483f04 | 26 | from . import mirrors |
a41085fb | 27 | from . import nopaste |
03706893 | 28 | from . import people |
df6180a5 | 29 | from . import ui_modules |
181d08f3 | 30 | from . import wiki |
12e5de7e | 31 | |
81675874 | 32 | class Application(tornado.web.Application): |
3e7c6ccd MT |
33 | def __init__(self, config, **kwargs): |
34 | # Initialize backend | |
a95c2f97 | 35 | self.backend = ipfire.Backend(config) |
a6dc0bad | 36 | |
9ed02e3b MT |
37 | settings = { |
38 | # Do not compress responses | |
39 | "gzip" : False, | |
40 | ||
41 | # Enable XSRF cookies | |
42 | "xsrf_cookies" : True, | |
43 | ||
44 | # Login | |
45 | "login_url" : "/login", | |
46 | ||
47 | # Setup directory structure | |
48 | "static_path" : self.backend.config.get("global", "static_dir"), | |
49 | "template_path" : self.backend.config.get("global", "templates_dir"), | |
50 | ||
eabe6b8d | 51 | # UI Methods |
9ed02e3b | 52 | "ui_methods" : { |
440aba92 | 53 | "format_asn" : self.format_asn, |
574a88c7 | 54 | "format_country_name" : self.format_country_name, |
6eddfb50 | 55 | "format_language_name" : self.format_language_name, |
e96e445b MT |
56 | "format_month_name" : self.format_month_name, |
57 | "format_phone_number" : self.format_phone_number, | |
58 | "format_phone_number_to_e164" : self.format_phone_number_to_e164, | |
59 | "format_phone_number_location" : self.format_phone_number_location, | |
60 | "grouper" : grouper, | |
cc3b928d | 61 | }, |
eabe6b8d MT |
62 | |
63 | # UI Modules | |
9ed02e3b | 64 | "ui_modules" : { |
f5b01fc2 | 65 | # Blog |
7e64f6a3 MT |
66 | "BlogHistoryNavigation": blog.HistoryNavigationModule, |
67 | "BlogList" : blog.ListModule, | |
f91dfcc7 | 68 | "BlogPost" : blog.PostModule, |
8a897d25 | 69 | "BlogPosts" : blog.PostsModule, |
f91dfcc7 | 70 | |
93feb275 MT |
71 | # Boot |
72 | "BootMenuConfig" : boot.MenuConfigModule, | |
73 | "BootMenuHeader" : boot.MenuHeaderModule, | |
74 | "BootMenuSeparator" : boot.MenuSeparatorModule, | |
75 | ||
eabe6b8d | 76 | # People |
dbb0c109 | 77 | "AccountsList" : people.AccountsListModule, |
c66f2152 | 78 | "Agent" : people.AgentModule, |
dbb0c109 MT |
79 | "CDR" : people.CDRModule, |
80 | "Channels" : people.ChannelsModule, | |
68ece434 | 81 | "MOS" : people.MOSModule, |
9150881e | 82 | "NewAccounts" : people.NewAccountsModule, |
b5e2077f | 83 | "Password" : people.PasswordModule, |
dbb0c109 | 84 | "Registrations" : people.RegistrationsModule, |
7afd64bb | 85 | "SIPStatus" : people.SIPStatusModule, |
917434b8 | 86 | |
e1814f16 MT |
87 | # Nopaste |
88 | "Code" : nopaste.CodeModule, | |
89 | ||
23f0179e | 90 | # Fireinfo |
96c9bb79 | 91 | "FireinfoDeviceTable" : fireinfo.DeviceTableModule, |
eabe6b8d MT |
92 | "FireinfoDeviceAndGroupsTable" |
93 | : fireinfo.DeviceAndGroupsTableModule, | |
94 | ||
6ac7e934 | 95 | # Wiki |
c21ffadb | 96 | "WikiDiff" : wiki.WikiDiffModule, |
6ac7e934 | 97 | "WikiNavbar" : wiki.WikiNavbarModule, |
f9db574a | 98 | "WikiList" : wiki.WikiListModule, |
6ac7e934 | 99 | |
eabe6b8d | 100 | # Misc |
6563eb49 | 101 | "ChristmasBanner" : ui_modules.ChristmasBannerModule, |
1c4522dc | 102 | "Markdown" : ui_modules.MarkdownModule, |
eabe6b8d MT |
103 | "Map" : ui_modules.MapModule, |
104 | "ProgressBar" : ui_modules.ProgressBarModule, | |
81675874 | 105 | }, |
3403dc5e MT |
106 | |
107 | # Call this when a page wasn't found | |
b22bc8e8 | 108 | "default_handler_class" : base.NotFoundHandler, |
9ed02e3b | 109 | } |
9068dba1 | 110 | settings.update(kwargs) |
5cf160e0 | 111 | |
ae0228e1 MT |
112 | tornado.web.Application.__init__(self, **settings) |
113 | ||
66862195 | 114 | authentication_handlers = [ |
08df6527 MT |
115 | (r"/login", auth.LoginHandler), |
116 | (r"/logout", auth.LogoutHandler), | |
66862195 MT |
117 | ] |
118 | ||
399506a8 | 119 | self.add_handlers(r"(dev|www)\.ipfire\.org", [ |
940227cb MT |
120 | # Entry site that lead the user to index |
121 | (r"/", IndexHandler), | |
940227cb | 122 | |
81675874 | 123 | # Download sites |
60b0917c | 124 | (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }), |
e77cd04c MT |
125 | (r"/download", download.IndexHandler), |
126 | (r"/download/([0-9a-z\-\.]+)", download.ReleaseHandler), | |
940227cb | 127 | |
e64ce07e | 128 | # Donate |
c7bcb9ca MT |
129 | (r"/donate", donate.DonateHandler), |
130 | (r"/donate/thank-you", donate.ThankYouHandler), | |
131 | (r"/donate/error", donate.ErrorHandler), | |
e64ce07e | 132 | (r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }), |
8d48f4ef | 133 | |
de683d7c | 134 | # RSS feed |
f0714277 | 135 | (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }), |
7f9dbcc0 MT |
136 | |
137 | # Redirect news articles to blog | |
d76ec66e | 138 | (r"/news/(.*)", handlers.NewsHandler), |
de683d7c | 139 | |
45592df5 | 140 | # Static Pages |
45592df5 | 141 | (r"/features", StaticHandler, { "template" : "features.html" }), |
45592df5 | 142 | (r"/legal", StaticHandler, { "template" : "legal.html" }), |
00026d8b | 143 | (r"/support", StaticHandler, { "template" : "support.html" }), |
45592df5 | 144 | |
14cd4fa8 MT |
145 | # Handle old pages that have moved elsewhere |
146 | (r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }), | |
3808b871 | 147 | (r"/(de|en)/(.*)", LangCompatHandler), |
37ed7c3c MT |
148 | |
149 | # Export arbitrary error pages | |
b22bc8e8 | 150 | (r"/error/([45][0-9]{2})", base.ErrorHandler), |
baa693a3 MT |
151 | |
152 | # Block page | |
b22bc8e8 | 153 | (r"/blocked", base.BlockedHandler), |
940227cb MT |
154 | ]) |
155 | ||
12e5de7e | 156 | # blog.ipfire.org |
440aba92 | 157 | self.add_handlers(r"blog\.ipfire\.org", [ |
8a897d25 | 158 | (r"/", blog.IndexHandler), |
cfc0823a | 159 | (r"/authors/(\w+)", blog.AuthorHandler), |
541c952b | 160 | (r"/compose", blog.ComposeHandler), |
0b342a05 | 161 | (r"/drafts", blog.DraftsHandler), |
d17a2624 | 162 | (r"/post/([0-9a-z\-\._]+)", blog.PostHandler), |
914238a5 | 163 | (r"/post/([0-9a-z\-\._]+)/delete", blog.DeleteHandler), |
d17a2624 MT |
164 | (r"/post/([0-9a-z\-\._]+)/edit", blog.EditHandler), |
165 | (r"/post/([0-9a-z\-\._]+)/publish", blog.PublishHandler), | |
e6b18dce | 166 | (r"/search", blog.SearchHandler), |
8d7487d2 | 167 | (r"/tags/([0-9a-z\-\.]+)", blog.TagHandler), |
7e64f6a3 | 168 | (r"/years/([0-9]+)", blog.YearHandler), |
f0714277 MT |
169 | |
170 | # RSS Feed | |
171 | (r"/feed.xml", blog.FeedHandler), | |
08df6527 | 172 | ] + authentication_handlers) |
12e5de7e | 173 | |
940227cb | 174 | # downloads.ipfire.org |
440aba92 | 175 | self.add_handlers(r"downloads?\.ipfire\.org", [ |
ed8116c7 | 176 | (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/" }), |
5cf65b4f | 177 | (r"/release/(.*)", download.ReleaseRedirectHandler), |
ed8116c7 | 178 | (r"/(.*)", download.FileHandler), |
54af860e | 179 | ]) |
940227cb MT |
180 | |
181 | # mirrors.ipfire.org | |
440aba92 | 182 | self.add_handlers(r"^mirrors\.ipfire\.org", [ |
95483f04 MT |
183 | (r"/", mirrors.IndexHandler), |
184 | (r"/mirrors/(.*)", mirrors.MirrorHandler), | |
3808b871 | 185 | ]) |
940227cb | 186 | |
d0d074e0 | 187 | # planet.ipfire.org |
440aba92 | 188 | self.add_handlers(r"planet\.ipfire\.org", [ |
3d4ce901 | 189 | (r"/", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/" }), |
d76ec66e MT |
190 | (r"/post/([A-Za-z0-9_-]+)", handlers.PlanetPostHandler), |
191 | (r"/user/([a-z0-9_-]+)", handlers.PlanetUserHandler), | |
bcc3ed4d MT |
192 | |
193 | # RSS | |
f0714277 | 194 | (r"/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }), |
d76ec66e | 195 | (r"/user/([a-z0-9_-]+)/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }), |
f0714277 | 196 | (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }), |
3808b871 | 197 | ]) |
d0d074e0 | 198 | |
66862195 | 199 | # fireinfo.ipfire.org |
440aba92 | 200 | self.add_handlers(r"fireinfo\.ipfire\.org", [ |
96c9bb79 | 201 | (r"/", fireinfo.IndexHandler), |
8ab37e0b | 202 | |
dc96f754 MT |
203 | # Admin |
204 | (r"/admin", fireinfo.AdminIndexHandler), | |
205 | ||
8ab37e0b MT |
206 | # Vendors |
207 | (r"/vendors", fireinfo.VendorsHandler), | |
208 | (r"/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler), | |
66862195 | 209 | |
1e3b2aad | 210 | # Driver |
0cd21a36 | 211 | (r"/drivers/(.*)", fireinfo.DriverDetail), |
1e3b2aad | 212 | |
66862195 | 213 | # Show profiles |
96c9bb79 | 214 | (r"/profile/random", fireinfo.RandomProfileHandler), |
b84b407f | 215 | (r"/profile/([a-z0-9]{40})", fireinfo.ProfileHandler), |
91a446f0 | 216 | |
ed2e3c1f | 217 | # Stats |
19518d6e | 218 | (r"/processors", fireinfo.ProcessorsHandler), |
ed2e3c1f MT |
219 | (r"/releases", fireinfo.ReleasesHandler), |
220 | ||
19518d6e | 221 | # Send profiles |
96c9bb79 | 222 | (r"/send/([a-z0-9]+)", fireinfo.ProfileSendHandler), |
dc96f754 | 223 | ] + authentication_handlers) |
5cf160e0 | 224 | |
c37ec602 | 225 | # i-use.ipfire.org |
440aba92 | 226 | self.add_handlers(r"i-use\.ipfire\.org", [ |
e2f2865d | 227 | (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/" }), |
395c1ac0 | 228 | (r"/profile/([a-f0-9]{40})/([0-9]+).png", iuse.ImageHandler), |
c37ec602 MT |
229 | ]) |
230 | ||
8e2e1261 MT |
231 | # boot.ipfire.org |
232 | BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot") | |
8fceca0a | 233 | self.add_handlers(r"boot(\.dev)?\.ipfire\.org", [ |
f301d952 | 234 | (r"/", tornado.web.RedirectHandler, { "url" : "https://wiki.ipfire.org/installation/pxe" }), |
8e2e1261 MT |
235 | |
236 | # Configurations | |
f301d952 MT |
237 | (r"/premenu.cfg", boot.PremenuCfgHandler), |
238 | (r"/menu.gpxe", boot.MenuGPXEHandler), | |
239 | (r"/menu.cfg", boot.MenuCfgHandler), | |
8e2e1261 MT |
240 | |
241 | # Static files | |
37b5c0cf | 242 | (r"/(boot\.png|pxelinux\.0|menu\.c32|vesamenu\.c32)", |
8e2e1261 MT |
243 | tornado.web.StaticFileHandler, { "path" : BOOT_STATIC_PATH }), |
244 | ]) | |
245 | ||
60024cc8 | 246 | # nopaste.ipfire.org |
440aba92 | 247 | self.add_handlers(r"nopaste\.ipfire\.org", [ |
a41085fb MT |
248 | (r"/", nopaste.CreateHandler), |
249 | (r"/raw/(.*)", nopaste.RawHandler), | |
250 | (r"/view/(.*)", nopaste.ViewHandler), | |
3808b871 | 251 | ] + authentication_handlers) |
60024cc8 | 252 | |
f5b01fc2 | 253 | # location.ipfire.org |
440aba92 | 254 | self.add_handlers(r"location\.ipfire\.org", [ |
f5b01fc2 | 255 | (r"/", location.IndexHandler), |
55eea098 | 256 | (r"/how\-to\-use", StaticHandler, { "template" : "../location/how-to-use.html" }), |
2517822e | 257 | (r"/lookup/(.+)/blacklists", location.BlacklistsHandler), |
f5b01fc2 MT |
258 | (r"/lookup/(.+)", location.LookupHandler), |
259 | ]) | |
260 | ||
9068dba1 | 261 | # geoip.ipfire.org |
440aba92 | 262 | self.add_handlers(r"geoip\.ipfire\.org", [ |
f5b01fc2 | 263 | (r"/", tornado.web.RedirectHandler, { "url" : "https://location.ipfire.org/" }), |
3808b871 | 264 | ]) |
9068dba1 | 265 | |
66862195 | 266 | # talk.ipfire.org |
440aba92 | 267 | self.add_handlers(r"talk\.ipfire\.org", [ |
786e9ca8 MT |
268 | (r"/", tornado.web.RedirectHandler, { "url" : "https://people.ipfire.org/" }), |
269 | ]) | |
66862195 | 270 | |
03706893 | 271 | # people.ipfire.org |
440aba92 | 272 | self.add_handlers(r"people\.ipfire\.org", [ |
786e9ca8 | 273 | (r"/", people.IndexHandler), |
2c65e17c | 274 | (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler), |
30aeccdb | 275 | (r"/conferences", people.ConferencesHandler), |
18b13823 | 276 | (r"/groups", people.GroupsHandler), |
736e7544 | 277 | (r"/groups/([a-z_][a-z0-9_-]{0,31})", people.GroupHandler), |
f32dd17f | 278 | (r"/register", auth.RegisterHandler), |
786e9ca8 MT |
279 | (r"/search", people.SearchHandler), |
280 | (r"/users", people.UsersHandler), | |
2c65e17c MT |
281 | (r"/users/([a-z_][a-z0-9_-]{0,31})", people.UserHandler), |
282 | (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", people.AvatarHandler), | |
283 | (r"/users/([a-z_][a-z0-9_-]{0,31})/calls/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", people.CallHandler), | |
284 | (r"/users/([a-z_][a-z0-9_-]{0,31})/calls(?:/(\d{4}-\d{2}-\d{2}))?", people.CallsHandler), | |
285 | (r"/users/([a-z_][a-z0-9_-]{0,31})/edit", people.UserEditHandler), | |
286 | (r"/users/([a-z_][a-z0-9_-]{0,31})/passwd", people.UserPasswdHandler), | |
287 | (r"/users/([a-z_][a-z0-9_-]{0,31})/sip", people.SIPHandler), | |
2dac7110 | 288 | |
92c4b559 MT |
289 | # Promotional Consent Stuff |
290 | (r"/subscribe", people.SubscribeHandler), | |
291 | (r"/unsubscribe", people.UnsubscribeHandler), | |
292 | ||
2dac7110 MT |
293 | # Single-Sign-On for Discourse |
294 | (r"/sso/discourse", people.SSODiscourse), | |
689effd0 | 295 | |
c7594d58 | 296 | # Password Reset |
391ede9e MT |
297 | (r"/password\-reset", auth.PasswordResetInitiationHandler), |
298 | (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler), | |
c7594d58 | 299 | |
226d2676 MT |
300 | # Stats |
301 | (r"/stats", people.StatsHandler), | |
302 | ||
689effd0 | 303 | # API |
66181c96 | 304 | (r"/api/check/email", auth.APICheckEmail), |
689effd0 | 305 | (r"/api/check/uid", auth.APICheckUID), |
786e9ca8 | 306 | ] + authentication_handlers) |
2cd9af74 | 307 | |
181d08f3 | 308 | # wiki.ipfire.org |
440aba92 | 309 | self.add_handlers(r"wiki\.ipfire\.org", |
181d08f3 MT |
310 | authentication_handlers + [ |
311 | ||
f2cfd873 | 312 | # Actions |
b26c705a | 313 | (r"((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))/_delete", wiki.ActionDeleteHandler), |
40cb87a4 | 314 | (r"([A-Za-z0-9\-_\/]+)?/_edit", wiki.ActionEditHandler), |
2901b734 | 315 | (r"([A-Za-z0-9\-_\/]+)?/_render", wiki.ActionRenderHandler), |
9db2e89f | 316 | (r"([A-Za-z0-9\-_\/]+)?/_(watch|unwatch)", wiki.ActionWatchHandler), |
d4c68c5c | 317 | (r"/actions/restore", wiki.ActionRestoreHandler), |
f2cfd873 MT |
318 | (r"/actions/upload", wiki.ActionUploadHandler), |
319 | ||
f9db574a MT |
320 | # Handlers |
321 | (r"/recent\-changes", wiki.RecentChangesHandler), | |
181d08f3 | 322 | (r"/search", wiki.SearchHandler), |
86368c12 | 323 | (r"/tree", wiki.TreeHandler), |
2f23c558 | 324 | (r"/watchlist", wiki.WatchlistHandler), |
f9db574a | 325 | |
f2cfd873 | 326 | # Media |
3b33319e | 327 | (r"([A-Za-z0-9\-_\/]+)?/_files", wiki.FilesHandler), |
f2cfd873 MT |
328 | (r"((?!/static)(?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", wiki.FileHandler), |
329 | ||
f9db574a | 330 | # Render pages |
181d08f3 MT |
331 | (r"([A-Za-z0-9\-_\/]+)?", wiki.PageHandler), |
332 | ]) | |
333 | ||
ae0228e1 | 334 | # ipfire.org |
45592df5 | 335 | self.add_handlers(r"ipfire\.org", [ |
ba43a892 | 336 | (r".*", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org" }) |
5cf160e0 | 337 | ]) |
3add293a | 338 | |
feb02477 MT |
339 | logging.info("Successfully initialied application") |
340 | ||
440aba92 MT |
341 | def format_asn(self, handler, asn): |
342 | return util.format_asn(asn) | |
343 | ||
574a88c7 MT |
344 | def format_country_name(self, handler, country_code): |
345 | return ipfire.countries.get_name(country_code) | |
346 | ||
6eddfb50 MT |
347 | def format_language_name(self, handler, language): |
348 | _ = handler.locale.translate | |
349 | ||
350 | if language == "de": | |
351 | return _("German") | |
352 | elif language == "en": | |
353 | return _("English") | |
354 | elif language == "es": | |
355 | return _("Spanish") | |
356 | elif language == "fr": | |
357 | return _("French") | |
358 | elif language == "it": | |
359 | return _("Italian") | |
360 | elif language == "nl": | |
361 | return _("Dutch") | |
362 | elif language == "pl": | |
363 | return _("Polish") | |
364 | elif language == "pt": | |
365 | return _("Portuguese") | |
366 | elif language == "ru": | |
367 | return _("Russian") | |
368 | elif language == "tr": | |
369 | return _("Turkish") | |
370 | ||
371 | return language | |
372 | ||
cc3b928d MT |
373 | def format_month_name(self, handler, month): |
374 | _ = handler.locale.translate | |
375 | ||
376 | if month == 1: | |
377 | return _("January") | |
378 | elif month == 2: | |
379 | return _("February") | |
380 | elif month == 3: | |
381 | return _("March") | |
382 | elif month == 4: | |
383 | return _("April") | |
384 | elif month == 5: | |
385 | return _("May") | |
386 | elif month == 6: | |
387 | return _("June") | |
388 | elif month == 7: | |
389 | return _("July") | |
390 | elif month == 8: | |
391 | return _("August") | |
392 | elif month == 9: | |
393 | return _("September") | |
394 | elif month == 10: | |
395 | return _("October") | |
396 | elif month == 11: | |
397 | return _("November") | |
398 | elif month == 12: | |
399 | return _("December") | |
400 | ||
401 | return month | |
401827c2 | 402 | |
e96e445b MT |
403 | def format_phone_number(self, handler, number): |
404 | if not isinstance(number, phonenumbers.PhoneNumber): | |
405 | try: | |
01e73b0e | 406 | number = phonenumbers.parse(number, None) |
e96e445b MT |
407 | except phonenumbers.phonenumberutil.NumberParseException: |
408 | return number | |
c01ad253 MT |
409 | |
410 | return phonenumbers.format_number(number, phonenumbers.PhoneNumberFormat.INTERNATIONAL) | |
411 | ||
e96e445b MT |
412 | def format_phone_number_to_e164(self, handler, number): |
413 | return phonenumbers.format_number(number, phonenumbers.PhoneNumberFormat.E164) | |
414 | ||
415 | def format_phone_number_location(self, handler, number): | |
416 | s = [ | |
417 | phonenumbers.geocoder.description_for_number(number, handler.locale.code), | |
418 | phonenumbers.region_code_for_number(number), | |
419 | ] | |
420 | ||
421 | return ", ".join((e for e in s if e)) | |
422 | ||
401827c2 MT |
423 | |
424 | def grouper(handler, iterator, n): | |
425 | """ | |
426 | Returns groups of n from the iterator | |
427 | """ | |
428 | i = iter(iterator) | |
429 | ||
430 | while True: | |
431 | ret = list(itertools.islice(i, 0, n)) | |
432 | if not ret: | |
433 | break | |
434 | ||
435 | yield ret |