Hello community, here is the log from the commit of package python-pyjokes for openSUSE:Factory checked in at 2019-09-11 10:36:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyjokes (Old) and /work/SRC/openSUSE:Factory/.python-pyjokes.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyjokes" Wed Sep 11 10:36:53 2019 rev:3 rq:729855 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyjokes/python-pyjokes.changes 2018-12-24 11:42:00.753419110 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyjokes.new.7948/python-pyjokes.changes 2019-09-11 10:36:54.671269784 +0200 @@ -1,0 +2,6 @@ +Tue Sep 10 12:09:42 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.6.0: + * trivial fixes + +------------------------------------------------------------------- Old: ---- pyjokes-0.5.0.tar.gz New: ---- pyjokes-0.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyjokes.spec ++++++ --- /var/tmp/diff_new_pack.FGeV9h/_old 2019-09-11 10:36:55.943269414 +0200 +++ /var/tmp/diff_new_pack.FGeV9h/_new 2019-09-11 10:36:55.967269407 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pyjokes # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyjokes -Version: 0.5.0 +Version: 0.6.0 Release: 0 Summary: One line jokes for programmers (jokes as a service) License: BSD-3-Clause Group: Development/Languages/Python -Url: https://github.com/pyjokes/pyjokes +URL: https://github.com/pyjokes/pyjokes Source: https://files.pythonhosted.org/packages/source/p/pyjokes/pyjokes-%{version}.tar.gz Source99: https://raw.githubusercontent.com/pyjokes/pyjokes/master/LICENCE.txt BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch - %python_subpackages %description @@ -50,7 +49,6 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} -%defattr(-,root,root,-) %doc README.rst %license LICENCE.txt %python3_only %{_bindir}/pyjoke ++++++ pyjokes-0.5.0.tar.gz -> pyjokes-0.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/PKG-INFO new/pyjokes-0.6.0/PKG-INFO --- old/pyjokes-0.5.0/PKG-INFO 2015-09-21 01:37:22.000000000 +0200 +++ new/pyjokes-0.6.0/PKG-INFO 2019-08-14 22:46:29.000000000 +0200 @@ -1,13 +1,15 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: pyjokes -Version: 0.5.0 +Version: 0.6.0 Summary: One line jokes for programmers (jokes as a service) -Home-page: https://github.com/pyjokes/pyjokes +Home-page: https://pyjok.es/ Author: Pyjokes Society -Author-email: UNKNOWN -License: BSD +Author-email: [email protected] +License: BSD License Description: .. image:: https://travis-ci.org/pyjokes/pyjokes.svg :target: https://travis-ci.org/pyjokes/pyjokes + .. image:: https://coveralls.io/repos/pyjokes/pyjokes/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/pyjokes/pyjokes?branch=master ======= pyjokes @@ -25,18 +27,20 @@ Usage ===== - Once installed, simply call `pyjoke` from the command line. + Once installed, simply call `pyjoke` from the command line or add it to your + .bashrc file to see a joke every time you open a terminal. - Alternatively use the `-c` flag to get jokes from a specific category. Options:: + Use the `-c` flag to get jokes from a specific category. Options:: -c neutral [default] (neutral geek jokes) - -c adult (adult geek jokes) -c chuck (Chuck Norris geek jokes) -c all (all jokes) + -c twister (Tongue-twister) - You can also access the jokes in your own project by importing `pyjokes` and using the functions `get_joke` and `get_jokes` + You can also access the jokes in your own project by importing `pyjokes` and + using the functions `get_joke` and `get_jokes`. - Comprehensive documentation is available at `http://pyjoke.es`_ + Documentation is available at https://pyjok.es/ Contributors ============ @@ -55,6 +59,10 @@ * `Yash Mehrotra`_ * `Marc Kirkwood`_ * `Gregory Parker`_ + * `Martin O'Hanlon`_ + * `Graham Markall`_ + * `Andreas Reinle`_ + Contributing ============ @@ -66,23 +74,15 @@ * Feel free to contribute jokes (via pull request or `proposal issue`_) * See the `contributing policy`_ on GitHub - Tests - ===== - - Install requirements (pytest) - - Run tests:: - - python setup.py test - Pyjokes Society =============== - This project is was founded at `PySS 2014`_ and is directed by the `Pyjokes Society`_. + This project was founded at `PySS 2014`_ and is directed by the + `Pyjokes Society`_. - .. _documentation: http://pyjoke.es/install/ - .. _http://pyjoke.es: http://pyjoke.es + .. _documentation: http://pyjok.es/install/ + .. _http://pyjok.es: http://pyjok.es/ .. _Ben Nuttall: https://github.com/bennuttall .. _Alex Savio: https://github.com/alexsavio .. _Borja Ayerdi: https://github.com/borjaayerdi @@ -92,6 +92,9 @@ .. _Yash Mehrotra: https://github.com/yashmehrotra .. _Marc Kirkwood: https://github.com/trojjer .. _Gregory Parker: https://github.com/ElectronicsGeek + .. _Martin O'Hanlon: https://github.com/martinohanlon + .. _Graham Markall: https://github.com/gmarkall + .. _Andreas Reinle: https://github.com/gras64 .. _BSD Licence: http://opensource.org/licenses/BSD-3-Clause .. _GitHub: https://github.com/pyjokes/pyjokes .. _GitHub Issues: https://github.com/pyjokes/pyjokes/issues @@ -101,10 +104,12 @@ .. _PySS 2014: http://www.pyss.org/ .. _Pyjokes Society: http://pyjok.es/society/ -Keywords: pyjokes,jokes -Platform: UNKNOWN +Keywords: pyjokes,pyjokes,jokes,joke +Platform: ALL Classifier: Development Status :: 4 - Beta Classifier: Topic :: Utilities Classifier: License :: OSI Approved :: BSD License Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 3 +Provides-Extra: test +Provides-Extra: doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/README.rst new/pyjokes-0.6.0/README.rst --- old/pyjokes-0.5.0/README.rst 2015-09-21 00:33:25.000000000 +0200 +++ new/pyjokes-0.6.0/README.rst 2019-08-14 15:14:51.000000000 +0200 @@ -1,5 +1,7 @@ .. image:: https://travis-ci.org/pyjokes/pyjokes.svg :target: https://travis-ci.org/pyjokes/pyjokes +.. image:: https://coveralls.io/repos/pyjokes/pyjokes/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/pyjokes/pyjokes?branch=master ======= pyjokes @@ -17,18 +19,20 @@ Usage ===== -Once installed, simply call `pyjoke` from the command line. +Once installed, simply call `pyjoke` from the command line or add it to your +.bashrc file to see a joke every time you open a terminal. -Alternatively use the `-c` flag to get jokes from a specific category. Options:: +Use the `-c` flag to get jokes from a specific category. Options:: -c neutral [default] (neutral geek jokes) - -c adult (adult geek jokes) -c chuck (Chuck Norris geek jokes) -c all (all jokes) + -c twister (Tongue-twister) -You can also access the jokes in your own project by importing `pyjokes` and using the functions `get_joke` and `get_jokes` +You can also access the jokes in your own project by importing `pyjokes` and +using the functions `get_joke` and `get_jokes`. -Comprehensive documentation is available at `http://pyjoke.es`_ +Documentation is available at https://pyjok.es/ Contributors ============ @@ -47,6 +51,10 @@ * `Yash Mehrotra`_ * `Marc Kirkwood`_ * `Gregory Parker`_ +* `Martin O'Hanlon`_ +* `Graham Markall`_ +* `Andreas Reinle`_ + Contributing ============ @@ -58,23 +66,15 @@ * Feel free to contribute jokes (via pull request or `proposal issue`_) * See the `contributing policy`_ on GitHub -Tests -===== - -Install requirements (pytest) - -Run tests:: - - python setup.py test - Pyjokes Society =============== -This project is was founded at `PySS 2014`_ and is directed by the `Pyjokes Society`_. +This project was founded at `PySS 2014`_ and is directed by the +`Pyjokes Society`_. -.. _documentation: http://pyjoke.es/install/ -.. _http://pyjoke.es: http://pyjoke.es +.. _documentation: http://pyjok.es/install/ +.. _http://pyjok.es: http://pyjok.es/ .. _Ben Nuttall: https://github.com/bennuttall .. _Alex Savio: https://github.com/alexsavio .. _Borja Ayerdi: https://github.com/borjaayerdi @@ -84,6 +84,9 @@ .. _Yash Mehrotra: https://github.com/yashmehrotra .. _Marc Kirkwood: https://github.com/trojjer .. _Gregory Parker: https://github.com/ElectronicsGeek +.. _Martin O'Hanlon: https://github.com/martinohanlon +.. _Graham Markall: https://github.com/gmarkall +.. _Andreas Reinle: https://github.com/gras64 .. _BSD Licence: http://opensource.org/licenses/BSD-3-Clause .. _GitHub: https://github.com/pyjokes/pyjokes .. _GitHub Issues: https://github.com/pyjokes/pyjokes/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/__init__.py new/pyjokes-0.6.0/pyjokes/__init__.py --- old/pyjokes-0.5.0/pyjokes/__init__.py 2015-09-21 01:35:47.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes/__init__.py 2019-08-14 15:50:33.000000000 +0200 @@ -1,5 +1,35 @@ +"One line jokes for programmers (jokes as a service)" + from __future__ import absolute_import from .pyjokes import get_joke, get_jokes -__version__ = '0.5.0' +__project__ = 'pyjokes' +__version__ = '0.6.0' +__keywords__ = ['pyjokes', 'pyjokes', 'jokes', 'joke'] +__author__ = 'Pyjokes Society' +__author_email__ = '[email protected]' +__url__ = 'https://pyjok.es/' +__platforms__ = 'ALL' + +__classifiers__ = [ + "Development Status :: 4 - Beta", + "Topic :: Utilities", + "License :: OSI Approved :: BSD License", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 3", +] + +__entry_points__ = { + 'console_scripts': [ + 'pyjoke = pyjokescli.pyjoke:main', + 'pyjokes = pyjokescli.pyjokes:main', + ], +} + +__requires__ = [] + +__extra_requires__ = { + 'doc': ['mkdocs'], + 'test': ['pytest', 'coverage', 'tox'], +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_de.py new/pyjokes-0.6.0/pyjokes/jokes_de.py --- old/pyjokes-0.5.0/pyjokes/jokes_de.py 2015-09-06 23:17:32.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes/jokes_de.py 2019-03-10 00:16:23.000000000 +0100 @@ -1,10 +1,162 @@ # -*- coding: utf-8 -*- neutral = [ - 'No jokes found.', + "Was steht auf dem Grabstein eines Mathematikers? 'Damit hat er nicht gerechnet.'", + "Ein Beamter zum anderen: 'Was haben die Leute nur, wir tun doch nichts'.", + "Wenn ein Yogalehrer seine Beine senkrecht nach oben streckt und dabei furzt, welche Yoga Figur stellt er da? Eine Duftkerze.", + u"Frage: Was ist das beste geschenkt für trump? Antwort : klopapier was soll man einem arschloch denn sonst schenken", + "Ich wollte Spiderman anrufen, aber er hatte kein Netz.", + "Sitzen 2 Bomben im Keller. Sagt die eine: 'Komm, lass hoch gehen.'", + u"Wie nennt man jemand der so tut als würde er etwas werfen? Einen Scheinwerfer.", + "Was steht auf dem Grabstein einer Putzfrau? 'Sie wird nie wieder kehren.'", + u"Abwasser ist ein Thema, das unbedingt geklärt werden muss.", + u"Warum ging der Luftballon kaputt? Aus Platzgründen.", + "Was steht auf dem Grabstein eines Spanners? 'Der ist weg vom Fenster.'", + u"Warum können Geister so schlecht lügen? Weil sie so leicht zu durchschauen sind.", + "Bei Adidas wurde eingebrochen. Was macht die Polizei? Sie schickt 3 Streifen.", + "Egal wie dicht du bist, Goethe war Dichter.", + "Wie war die Stimmung in der DDR ? Sie hielt sich in Grenzen", + u"Auch im Osten trägt man Westen.", + u"Was bekommt ein Kannibale wenn er zu spät zum Essen kommt? Die kalte Schulter.", + "Was steht auf dem Grabstein eines Geisterfahrers?.... 'Entgegenkommend. bis zuletzt.'", + u"Was ist ein Keks unter einem Baum? Ein schattiges Plätzchen.", + u"Warum geht der Sarg nicht auf? Weil ein Zuhälter drin liegt.", + "Treffen sich zwei Blitze. Hey, schlag' ein !", + "Was macht ein Terrorist im Treppenhaus? - Hoch gehen", + u"Das Motto eines McDonald's-Angestellten? Frittieren geht über Studieren.", + u"Patient: Ich bin so nervös. Das ist meine erste Operation. 'Doktor:' Keine Sorge, meine auch.", + "Wie waren die letzten Worte des Sportlehrers? 'Alle Speere zu mir.'", + u"Wie nennt man das Weiße in Vogelscheiße? Auch Vogelscheiße!", + u"Papi, da ist so ein Mann an der Tür. Er sagt, er sammelt für das Altersheim. Oh, dass ist super. Gibt ihm Opa mit.", + "Zahnarzt zum Patienten: Sie brauchen eine Krone - Patient: Endlich versteht mich jemand.", + "Eine Wolke zur anderen: Hast du einen Wolkenkratzer gesehen, habe schlimmen Juckreiz.", + "Sagt der Bauer zu seinem Urlaubsgast: 'Bei uns auf dem Land, weckt einen der Hahn.' 'Sehr gut, bitte auf 11 Uhr stellen!'", + "Fragt der Richter den Angeklagten: 'Wo waren Sie zwischen 3 und 4?' 'Im Kindergarten!', antwortet der Angeklagte.", + u"Ein Schönheitschirurg zum anderen: Nah, was machst du den heute für ein Gesicht...", + "Ein Schwein schaut eine Steckdose an und sagt: Wer hat dich den eingemauert? ", + u"Der Lehrer fragt : 'Warum ist Strom so wichtig?' Peter antwortet: 'Wenn es keinen Strom gäbe, müssten wir bei Kerzenlicht fernsehen.'", + "Altes chinesisches Sprichwort: In jeden Topf passt ein Dackel.", + u"Wie unterscheidet man deutsches Bier und einen holländischen Elfmeter: Das deutsche Bier geht immer rein.", + u"Wieso eigentlich legen Hühner Eier? - Schmeißen geht nicht. Gehen doch sonst kaputt.", + u"Ein Bauer wird gefragt, wie viele Schafe er hat. 'Keine Ahnung. Immer wenn ich anfange zu zählen, schlafe ich ein.'", + "Mann mit Frosch aufm Kopf geht zum Arzt. 'Frosch:' 'Doktor, ich bin da in was reingetreten.'", + "Was steht bei einem Spanner auf dem Grabstein? ..... So bin jetzt weg vom Fenster.", + u"Lebensweisheit: Flutscht dir der Föhn in die Wanne, dann war das deine letzte Panne.", + "Was ist schlimmer als ein Wurm im Apfel? Ein halber Wurm in einem angebissenen Apfel.", + u"Warum haben Eskimos die höchste Lebenserwartung?... Sie können nicht ins Gras beißen.", + u"Geld allein macht niemanden glücklich. Man sollte es schon besitzen.", + "Spruch: Nimm dir ein Beispiel an dem Sofa. Es muss auch mit jedem Furz zurechtkommen.", + u"Lukas beschwert sich zu Hause: 'Diese doofe Lehrerin! Beklagt sich über meine Schrift, dabei sehen ihre Einser wie Vierer aus!'", + "Trinkspruch: Trinke nie mehr, als mit aller Gewalt reingeht.", + "Was macht ein Pole aufm Eis? Einbrechen.", + u"Gedicht zum Schluss: Alle Kinder entkamen dem Bären, nur nicht Kim, der fiel hin. ", + "Mutti kaufst Du mir Kekse? Hol dir doch welche!Aber Mutti, ich habe doch keine Arme.Keine Arme keine Kekse ", + "'Mein Mann starb schon acht Tage nach unserer Hochzeit!' 'Na ja, dann hat er ja nicht lange gelitten!'", + u"Die Omi zum Enkel:'Du darfst Dir von mir ein schönes Buch wünschen.''Dann wünsche ich mir Dein Sparbuch.'", + "Sie: 'Ich hatte Dir doch gesagt, 2 Bier und um 22 Uhr bist Du wieder zu Hause!' Er: 'Ach, so herum war das'", + u"Kommt einer zum Arzt und sagt Doktor Doktor mein Problem ist es keiner hört mir zu! Darauf der Doktor: Der Nächste bitte!", + u"Die Kundin: 'Ich brauche Äpfel für meinen Mann, sind diese hier mit einem Gift bespritzt?' 'Nein, das müssen Sie schon selber machen!'", + u"Kommt ein Hahn mit einem Straußenei auf seine Hühnerfarm: 'Mädels, ich will ja nicht meckern, aber schaut mal, was die Konkurrenz macht'", + u"Angeklagter, ich möchte wirklich wissen - warum Sie so viel lügen.'Das kommt daher, weil Sie so viel fragen, Herr Richter.'", + "Auf dem Standesamt:'Sagen Sie, Herr Zufall, sind Sie sicher, dass Sie Ihren Sohn 'Rainer' nennen wollen?'", + u"Fährt ein Mann zur Tankstelle:'Wieviel kostet ein Tropfen Benzin ?''Nichts''Also, dann tropfen Sie mir bitte den Tank voll !'", +] +chuck = [ + u"Chuck Norris streichelt keine Tiere, die Tiere streicheln sich selbst, wenn er in der Nähe ist", + u"Chuck Norris braucht die Toilette nicht zu spülen. Er sagt einfach Buh! und schon haut die Scheiße von alleine ab.", + u"Chuck Norris verwählt sich nicht. Wenn du abhebst, warst du am falschen Telefon.", + u"Chuck Norris hat einen Grizzlybär-Teppich. Der Bär lebt, hat bloß Angst, sich zu bewegen.", + "Wenn Chuck Norris mit nassen Fingern an der Steckdose rumfummelt, kriegt das Kraftwerk einen Schlag.", + "Chuck Norris kann mit Durchfall furzen.", + u"Wenn Chuck Norris einen Raum betritt, stehen sogar die Stühle auf!", + "Chuck Norris hat bei Burgerking einen Big Mac bestellt - und hat ihn ohne Wiederworte bekommen", + u"Chuck Norris war bereits auf dem Mars. Das ist der Grund dafür, warum es dort kein Leben mehr gibt.", + "Chuck Norris wurde letztens von der Polizei angehalten... Die Polizisten sind mit einer Verwarnung davon gekommen.", + "Chuck Norris kackt Lichtschwerter.", + u"Herr Norris benutzt keine Kondome, denn es gibt nichts, was vor ihm schützen könnte.", + "Wie trinkt Chuck Norris seinen Kaffee? Antwort: Schwarz ohne Wasser!", + "Was geht den Opfern von Chuck Norris als Letztes durch den Kopf: SEIN FUSS.", + "Egal was dir Chuck Norris kocht. Es schmeckt einfach gut!", + u"Chuck Norris' Hund sammelt seine Haufen selbst ein, weil sich Chuck für niemanden bückt.", + u"Endlich weiß man, warum sich das Universum ausdehnt. Alles versucht sich so weit wie möglich von Chuck Norris zu entfernen.", + u"Chuck Norris' Computertastatur hat keine Löschtaste. Chuck Norris macht keine Fehler.", + u"Chuck Norris bekommt auch Geld für Flaschen ohne Pfand.", + "Chuck Norris darf vom Beckenrand springen.", + u" Bill Gates lebt in ständiger Angst, dass der PC von Chuck Norris abstürzt.", + u"Der wahre Grund, warum sich Hitler tötete, ist dass Hitler herausgefunden hat, dass Chuck Norris Jude ist.", + "Chuck Norris hat versucht Gewicht zu verlieren. Jedoch verliert Chuck niemals.", + u"Chuck Norris kann Drehtüren eintreten.", + "Alle Menschen malen den Teufel an die Wand, der Teufel aber malt Chuck Norris an die Wand.", + "Chuck isst keinen Honig, er kaut Bienen!", + "Das Universum dehnt sich aus weil Chuck Norris furzt.", + "Chuck war Kamikaze-Pilot.... 12 mal.", + "Einmal hat Herr Norris eine ganze Torte gegessen, bevor ihm jemand sagen konnte, dass eine Stripperin drin war.", + u" Chuck Norris darf die Straße neben dem Zebrastreifen überqueren.", + "Was ist der Unterschied zwischen Chuck Norris und Gott? Gott kennt Gnade...", + u"Chuck Norris wurde von der hochgiftigen ... Black Mamba .. gebissen. Nach 3 Tagen Höllenqualen ist die Black Mamba verstorben.", + u"Chuck Norris hat keine Herzattacken. Kein Herz wäre so verrückt Chuck zu attackieren." + "Chuck Norris kann einen Hut aus einem Hasen zaubern.", + "Besser mit Chuck Norris teilen als von Chuck Norris geteilt zu werden. ", + u"Chuck Norris war in der Hölle. Der Teufel ist vor Angst gestorben.", + "Warum weinen Kinder wenn sie auf die Welt kommen, weil sie wissen dass sie eine Welt mit Chuck Norris betreten haben.", + "Chuck Norris ist der Einzige, der die Zeit wirklich totschlagen kann.", + u"Chuck Norris ist Fallschirmspringen gegangen. Sein Fallschirm hat sich nicht geöffnet. Er ist den Fallschirm danach umtauschen gegangen. ", + "Chuck Norris bekommt nie Spam-Emails.", + "Chuck Norris wartet nicht auf die Bahn. Die Bahn wartet auf Chuck Norris. ", + u"Chuck Norris ist so hart, wenn er den Schleudersitz betätigt, wird nicht er sondern das Flugzeug weggeschleudert.", + "Chuck Norris darf die Rettungsgasse auf der Autobahn benutzen. ", + u"Wie heißt das Tagebuch von Chuck Norris?...... Guinessbuch der Rekorde!", + "Chuck Norris versteht Frauen.", + "Chuck Norris brachte seinem Vater rasieren bei.", + "Wenn Chuck Norris ins Kino geht, bekommt er ein Fernbedienung.", + "Wenn Chuck Norris Fallschirmspringen geht, braucht er keinen Fallschirm. Der Fallschirm braucht ihn.", + u"Chuck Norris tank nicht. Das Auto fährt aus Respekt.", + u"In einem Zimmer gibt es 156 Dinge mit denen dich Chuck Norris töten kann, einschließlich dem Raum.", + u"Es gibt Aliens, welche die Welt erobern wollen. Sie warten nur bis Chuck Norris gestorben ist damit sie angreifen können!", + u"Chuck Norris furzt nur, um zu töten.", + "Wenn Chuck Norris raucht, bekommt er keinen Lungenkrebs sondern die Zigarette Norriskrebs.", + "Chuck braucht ein Stunt-Double. Aber nur in Szenen, in denen er weinen soll.", + u"Chuck Norris Tränen können theoretisch Krebs heilen, doch Chuck Norris weint nicht.", + u"Chuck Norris Haus hat keine Türen, sondern nur eine Mauer durch die er läuft.", + u"Chuck Norris hat einen Handgranate geschmissen und 50 Leute getötet. Danach explodierte die Granate.", + u"Chuck Norris kann dich mit einem Schnurlostelefon erwürgen.", + "Chuck Norris bucht in einem Schweizer Hotel ein Zimmer mit Meerblick und bekommt es.", + "Chuck Norris darf an Tankstellen rauchen.", + "Chuck Norris spielt Paint-Ball ohne Maske. ", + "Chuck Norris kennt keine Angst. Die Angst kennt ihn.", + "Chuck Norris ist eigentlich vor 10 Jahren gestorben, der Tod hatte aber nie den Mut, es ihm zu sagen.", + u"Chuck Norris kann im Kinderkarussell überholen.", + u"Wenn sich ein Zug umbringen möchte, wirft er sich vor Chuck Norris. ", + "Chuck Norris telefoniert trotz Tastensperre.", + u"Chuck Norris hat keinen Schatten. Die Wand möchte nur so aussehen wie Chuck Norris.", + "Chuck Norris hat als Kind Sandburgen gebaut - heute nennt man sie Pyramiden.", + "Chuck Norris kann eine Bank ausrauben und zwar per Telefonbanking.", +] +twister = [ + u"Acht alte Ameisen aßen am Abend Ananas. ", + "Als wir noch in der Wiege lagen, gab's noch keine Liegewagen. Jetzt kann man in den Wagen liegen und sich in allen Lagen wiegen. ", + "Brautkleid bleibt Brautkleid und Blaukraut bleibt Blaukraut.", + u"Denen Dänen, denen Dänen Dänen dehnen, dehnen deren Dänen.", + "Einsame Esel essen nasse Nesseln gern, nasse Nesseln essen einsame Esel gern.", + "Der dicke Dachdecker deckt dir dein Dach. Drum dank dem Dachdecker, der dir dein Dach deckt.", + "Der Frosterfrosch frostet im Froschfroster, frostet der Frosterfrosch im Froschfroster? Im Froschfroster frostet der Frosterfrosch.", + u"Fromme Frösche fressen frische Frühlingszwiebeln, aber freche Frösche fressen frische Früchte", + "Der Cottbusser Postkutscher putzt den Cottbusser Postkutschkasten. Den Cottbusser Postkutschkasten putzt der Cottbusser Postkutscher.", + u"Es soll vorkommen, daß die Nachkommen mit dem Einkommen nicht mehr auskommen und dann vollkommen verkommen umkommen.", + "Auf den sieben Robbenklippen sitzen sieben Robbensippen, die sich in die Rippen stippen, bis sie von den Klippen kippen.", + "Das Schleimschwein schleimt schweinisch im Schleim, im Schleim schleimt schweinisch das Schleimschwein.", + u"Wer nichts weiß und weiß, dass er nichts weiß, weiß mehr als der, der nichts weiß und nicht weiß, dass er nichts weiß.", + u"Wir Wiener Wäscheweiber würden weiße Wäsche waschen, wenn wir wüssten, wo warmes, weiches Wasser wäre.", + u"Vor Weihnachten wirbeln wunderschöne weiße Schneeflocken wie weiche wollige Watte über den Waldrand hinweg.", + "Zwischen zwei Zwetschgenzweigen sitzen zwei zechenschwarze tschechisch zwitschernde Zwergschwalben.", + u"Geschwisterzwist zwischen Slivovic schlürfenden, spitzen, twistenden und schwitzenden Zwitscherschwestern.", + "Wenn Grillen Grillen grillen, grillen Grillen Grillen!", + "Herr von Hagen darf ich's wagen, sie zu fragen, welchen Kragen sie getragen, als sie lagen krank am Magen in der Stadt zu Kopenhagen.", ] jokes_de = { 'neutral': neutral, - 'all': neutral, + 'all': neutral + chuck + twister, + 'chuck': chuck, + 'twister': twister } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_en.py new/pyjokes-0.6.0/pyjokes/jokes_en.py --- old/pyjokes-0.5.0/pyjokes/jokes_en.py 2015-09-20 23:22:06.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes/jokes_en.py 2019-08-14 15:14:51.000000000 +0200 @@ -1,40 +1,39 @@ # -*- coding: utf-8 -*- """ -Jokes from stackoverflow - provided under CC BY-SA 3.0 +Initial jokes from stackoverflow - provided under CC BY-SA 3.0 http://stackoverflow.com/questions/234075/what-is-your-best-programmer-joke?page=4&tab=votes#tab-top """ neutral = [ + "Complaining about the lack of smoking shelters, the nicotine addicted Python programmers said there ought to be 'spaces for tabs'.", "Ubuntu users are apt to get this joke.", "Obfuscated Reality Mappers (ORMs) can be useful database tools.", - "I wonder if the MPs voting on the Digital Economy Bill think that Creative Commons is a Parliamentary initiative.", "Asked to explain Unicode during an interview, Geoff went into detail about his final year university project. He was not hired.", - "Triumphantly, Beth removed Python 2.7 from her server in 2020. 'Finally!' she said with glee, only to see the announcement for Python 4.4.", + "Triumphantly, Beth removed Python 2.7 from her server in 2030. 'Finally!' she said with glee, only to see the announcement for Python 4.4.", "An SQL query goes into a bar, walks up to two tables and asks, 'Can I join you?'", "When your hammer is C++, everything begins to look like a thumb.", "If you put a million monkeys at a million keyboards, one of them will eventually write a Java program. The rest of them will write Perl.", "To understand recursion you must first understand recursion.", - "Friends don't let friends use Python 2.7", "I suggested holding a 'Python Object Oriented Programming Seminar', but the acronym was unpopular.", - "'Knock, knock.' 'Who’s there?' ... very long pause ... 'Java.'", - "How many programmers does it take to change a light bulb? None, that's a hardware problem.", - "What's the object-oriented way to become wealthy? Inheritance", + "'Knock, knock.' 'Who's there?' ... very long pause ... 'Java.'", + "How many programmers does it take to change a lightbulb? None, that's a hardware problem.", + "What's the object-oriented way to become wealthy? Inheritance.", "Why don't jokes work in octal? Because 7 10 11.", - "How many programmers does it take to change a light bulb? None, they just make darkness a standard.", + "How many programmers does it take to change a lightbulb? None, they just make darkness a standard.", "Two bytes meet. The first byte asks, 'Are you ill?' The second byte replies, 'No, just feeling a bit off.'", "Two threads walk into a bar. The barkeeper looks up and yells, 'Hey, I want don't any conditions race like time last!'", "Old C programmers don't die, they're just cast into void.", - "Eight bytes walk into a bar. The bartender asks, 'Can I get you anything?' 'Yeah,' reply the bytes. 'Make us a double.'", - "Why did the programmer quit his job? Because they didn't get arrays.", + "Eight bytes walk into a bar. The bartender asks, 'Can I get you anything?' 'Yeah,' replies the bytes. 'Make us a double.'", + "Why did the programmer quit his job? Because he didn't get arrays.", "Why do Java programmers have to wear glasses? Because they don't see sharp.", - "Software developers like to solve problems. If there are no problems handily available, they will create their own problems.", + "Software developers like to solve problems. If there are no problems handily available, they will create their own.", ".NET was named .NET so that it wouldn't show up in a Unix directory listing.", "Hardware: The part of a computer that you can kick.", "A programmer was found dead in the shower. Next to their body was a bottle of shampoo with the instructions 'Lather, Rinse and Repeat'.", "Optimist: The glass is half full. Pessimist: The glass is half empty. Programmer: The glass is twice as large as necessary.", "In C we had to code our own bugs. In C++ we can inherit them.", - "How come there is not obfuscated Perl contest? Because everyone would win.", + "How come there is no obfuscated Perl contest? Because everyone would win.", "If you play a Windows CD backwards, you'll hear satanic chanting ... worse still, if you play it forwards, it installs Windows.", "How many programmers does it take to kill a cockroach? Two: one holds, the other installs Windows on it.", "What do you call a programmer from Finland? Nerdic.", @@ -42,10 +41,10 @@ "Why did Microsoft name their search engine BING? Because It's Not Google.", "Pirates go 'arg!', computer pirates go 'argv!'", "Software salesmen and used-car salesmen differ in that the latter know when they are lying.", - "Child: Dad, why does the sun rise in the east and set in the west? Dad: Son, it's working, don't touch", - "Why do programmers confuse Halloween with Christmas? Because OCT 31 == DEC 25", + "Child: Dad, why does the sun rise in the east and set in the west? Dad: Son, it's working, don't touch it.", + "Why do programmers confuse Halloween with Christmas? Because OCT 31 == DEC 25.", "How many Prolog programmers does it take to change a lightbulb? false.", - "Real programmers can write assembly code in any language", + "Real programmers can write assembly code in any language.", "Waiter: Would you like coffee or tea? Programmer: Yes.", "What do you get when you cross a cat and a dog? Cat dog sin theta.", "If loving you is ROM I don't wanna read write.", @@ -67,35 +66,45 @@ "I've been using Vim for a long time now, mainly because I can't figure out how to exit.", "How do you know whether a person is a Vim user? Don't worry, they'll tell you.", "Waiter: He's choking! Is anyone a doctor? Programmer: I'm a Vim user.", - "3 Database Admins walked into a NoSQL bar. A little while later they walked out because they couldn’t find a table.", + "3 Database Admins walked into a NoSQL bar. A little while later they walked out because they couldn't find a table.", "How to explain the movie Inception to a programmer? When you run a VM inside another VM, inside another VM ... everything runs real slow!", "What do you call a parrot that says \"Squawk! Pieces of nine! Pieces of nine!\"? A parrot-ey error.", "There are only two hard problems in Computer Science: cache invalidation, naming things and off-by-one-errors.", - "There are 10 types of people: those who understand binary and those who don't", - "There are 2 types of people: those who can interpret incomplete data sets...", + "There are 10 types of people: those who understand binary and those who don't.", + "There are 2 types of people: those who can extrapolate from incomplete data sets...", "There are II types of people: Those who understand Roman Numerals and those who don't.", - "There are 10 types of people: those who understand hexadecimal and 15 others", + "There are 10 types of people: those who understand hexadecimal and 15 others.", "There are 10 types of people: those who understand binary, those who don't, and those who were expecting this joke to be in trinary.", "There are 10 types of people: those who understand trinary, those who don't, and those who have never heard of it.", "What do you call eight hobbits? A hobbyte.", "The best thing about a Boolean is even if you are wrong, you are only off by a bit.", "A good programmer is someone who always looks both ways before crossing a one-way street.", "There are two ways to write error-free programs; only the third one works.", + "QAs consist of 55% water, 30% blood and 15% Jira tickets.", + "Sympathy for the Devil is really just about being nice to QAs.", + "How many QAs does it take to change a lightbulb? They noticed that the room was dark. They don't fix problems, they find them.", + "A programmer crashes a car at the bottom of a hill, a bystander asks what happened, he says \"No idea. Let's push it back up and try again\".", + "What do you mean 911 is only for emergencies? I've got a merge conflict.", + "Writing PHP is like peeing in the swimming pool, everyone did it, but we don't need to bring it up in public.", + "Why did the QA cross the road? To ruin everyone's day.", + "Number of days since I have encountered an array index error: -1.", + "Number of days since I have encountered an off-by-one error: 0.", + "Speed dating is useless. 5 minutes is not enough to properly explain the benefits of the Unix philosophy.", + "Microsoft hold a bi-monthly internal \"productive week\" where they use Google instead of Bing.", + "Schrodinger's attitude to web development: If I don't look at it in Internet Explorer then there's a chance it looks fine.", + "Finding a good PHP developer is like looking for a needle in a haystack. Or is it a hackstack in a needle?", + "Unix is user friendly. It's just very particular about who its friends are.", + "A COBOL programmer makes millions with Y2K remediation and decides to get cryogenically frozen. \"The year is 9999. You know COBOL, right?\"", + "The C language combines all the power of assembly language with all the ease-of-use of assembly language.", + "An SEO expert walks into a bar, bars, pub, public house, Irish pub, tavern, bartender, beer, liquor, wine, alcohol, spirits...", + "What does 'Emacs' stand for? 'Exclusively used by middle aged computer scientists.'", + "What does pyjokes have in common with Adobe Flash? It gets updated all the time, but never gets any better.", + "Why does Waldo only wear stripes? Because he doesn't want to be spotted.", + "I went to a street where the houses were numbered 8k, 16k, 32k, 64k, 128k, 256k and 512k. It was a trip down Memory Lane.", + "!false, (It's funny because it's true)", + "['hip', 'hip'] (hip hip array!)", ] -adult = [ - "Programming is like sex: One mistake and you have to support it for the rest of your life.", - "Software is like sex: It's better when it's free.", - "Software is like sex: It's never REALLY free.", - "There are 10 types of people: those who understand binary, and those who get laid.", - "Why programmers like UNIX: unzip, strip, touch, finger, grep, mount, fsck, more, yes, fsck, fsck, fsck, umount, sleep", - "If your mom was a collection class, her insert method would be public.", - "Your momma's so fat that not even Dijkstra is able to find a shortest path around her.", - "C++ - where your friends have access to your private members.", - "The only intuitive user interface is the nipple. After that, it's all learned.", - "What's the difference between software development and sex? In sex, you don't get a bonus for releasing early.", - "Your momma's so fat, the recursive function calculating her mass causes a stack overflow.", -] """ Jokes from The Internet Chuck Norris DB (ICNDB) (http://www.icndb.com/) - provided under CC BY-SA 3.0 @@ -133,7 +142,7 @@ "Chuck Norris can access private methods.", "Chuck Norris can instantiate an abstract class.", "Chuck Norris does not need to know about Class Factory Pattern. He can instantiate interfaces.", - "The class object inherits from Chuck Norris", + "The class object inherits from Chuck Norris.", "For Chuck Norris, NP-Hard = O(1).", "Chuck Norris knows the last digit of Pi.", "Chuck Norris's Internet connection is faster upstream than downstream because even data has more incentive to run from him than to him.", @@ -198,18 +207,18 @@ "Chuck Norris could use anything in java.util.* to kill you, including the javadocs.", "Code runs faster when Chuck Norris watches it.", "Chuck Norris doesn't use REST, he waits.", - "Everyone likes Chuck Norris on Facebook, whether they choose to or not", - "You can't follow Chuck Norris on Twitter, because he follows you", + "Everyone likes Chuck Norris on Facebook, whether they choose to or not.", + "You can't follow Chuck Norris on Twitter, because he follows you.", "Chuck Norris's calculator has only 3 keys: 0, 1, and NAND.", "Chuck Norris only uses global variables. He has nothing to hide.", "Chuck Norris once implemented an HTTP server in a single printf call. It is now the heart of Apache webserver.", - "Chuck Norris writes directly in binary. He then writes the source code as documentation for other programers.", + "Chuck Norris writes directly in binary. He then writes the source code as documentation for other programmers.", "Chuck Norris once shifted a bit so hard, it ended up on a different computer.", + "Q: What is Chuck Norris's favorite Javascript framework? A: Knockout.js.", ] jokes_en = { 'neutral': neutral, - 'adult': adult, 'chuck': chuck, - 'all': neutral + adult + chuck, + 'all': neutral + chuck, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_es.py new/pyjokes-0.6.0/pyjokes/jokes_es.py --- old/pyjokes-0.5.0/pyjokes/jokes_es.py 2015-09-06 23:17:32.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes/jokes_es.py 2019-03-10 00:16:23.000000000 +0100 @@ -1,19 +1,23 @@ # -*- coding: utf-8 -*- neutral = [ - 'Se abre el ascensor y hay un programador dentro, le preguntan: - ¿Sube o baja? A lo que el programador responde: - Sí.', - 'Qué le dice un bit al otro? Nos vemos en el bus.', -] - -adult = [ - '¿Qué es una mujer objeto? Un instancia de una mujer con clase', - '- Cuántos dalmatas habia en la peli? - 101. - Por el culo te la hinco!', - 'Encuentran programador muerto en la ducha con un bote de champu: "enjabonar, aclarar y vuelta a empezar"', - 'Esto es un mainframe que le dice a un PC: "tan pequeno y ya "computas"?' + 'Se abre el ascensor y hay un programador dentro, le preguntan: - Sube o baja? A lo que el programador responde: - Si.', + 'Que le dice un bit al otro? Nos vemos en el bus.', + 'Atracador: El dinero o la vida! Programador: Lo siento, soy programador. Atracador: Y? Programador: No tengo dinero ni vida.', + 'Que es un terapeuta? - 1024 Gigapeutas', + 'Cuantos programadores hacen falta para cambiar una bombilla? - Ninguno, porque es un problema de hardware.', + 'Se abre el telon, aparece un informatico y dice: que habeis tocado que no se cierra el telon!', + '- ...fallece una persona mientras estudiaba en la biblioteca - Que estaba estudiando? - La API de Windows.', + 'Que le dice un GIF a un JPG? -Animate hombre...', + 'Que dice un informatico que se esta ahogando en la playa?: F1, F1!', + 'Solo hay 10 tipos de personas en el mundo, las que entienden binario y las que no.', + 'Solo hay 10 tipos de personas en el mundo: las que entienden trinario, las que no, y las que lo confunden con binario.', + 'Una mujer dice a su marido informatico: - Ve al supermercado y trae una barra de pan, y si hay huevos, doce. Trajo doce barras de pan.', + 'Quien demonios es el general Failure, y que hace intentando leer de mi disco duro?', + 'En que se diferencian Windows y un virus? En que el virus funciona, y es gratis.' ] jokes_es = { 'neutral': neutral, - 'adult': adult, - 'all': neutral + adult, + 'all': neutral, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_eu.py new/pyjokes-0.6.0/pyjokes/jokes_eu.py --- old/pyjokes-0.5.0/pyjokes/jokes_eu.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokes/jokes_eu.py 2019-03-10 00:16:23.000000000 +0100 @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +neutral = [ + 'Zer dira 8 Bocabits? BocaByte bat ', + 'Zer esaten dio bit batek besteari? Busean ikusten gara!', + 'Zer da terapeuta bat? - 1024 Gigapeuta', + 'Aita, aita, aita!!! Utziko al didazu telebista ikusten? Bai! Baina pizten ez!', + 'Matematika liburu batek bere buruaz beste egin zuen... zergatik? Problema asko zituelako.', +] + +jokes_eu = {'neutral': neutral, 'all': neutral} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_gl.py new/pyjokes-0.6.0/pyjokes/jokes_gl.py --- old/pyjokes-0.5.0/pyjokes/jokes_gl.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokes/jokes_gl.py 2019-03-10 00:16:23.000000000 +0100 @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +neutral = [ + 'Abrese o elevador e hai un programador dentro. Preguntanlle: Sube ou baixa? O programador respondelle: - Si', + 'Que lle di un bit a outro? Vemonos no bus.', + 'Atracador: Os cartos ou a vida! Programador: Sintoo, son programador. Atracador: E? Programador: Non posuo nin cartos nin vida.', + 'Que e un terapeuta? - 1024 gigapeutas', + 'Cantos programadores fan falta para cambiar unha lampada? - Ningun, e un problema de hardware.', + 'Abrese o pano, aparece un informatico e di: Que tocachedes que o pano non se cerra!', + 'Falece unha persoa mentres estudaba na biblioteca. - Que estaba a estudar? - A API de Windows', + 'Que lle di un GIF a un PNG? - Animate, home...', + 'Que berra un informatico que se esta a afogar na praia? F1, F1!', + 'So hay 10 tipos de persoas no mundo, aquelas que entenden binario e as que non', + 'So hay 10 tipos de persoas no mundo, as que entenden trinario, as que non, e as que o confunden co binario.', + 'Unha muller dixo o seu home: - Ve a tenda e trae unha barra de pan, e, se hai ovos, doce. Volveu con doce barras de pan.', + 'Podese saber quen demonios e o General Failure? Esta tratando de ler o meu disco duro.', + 'En que se diferencian Windows e un virus? En que o virus funciona, e e gratis.' +] + +jokes_gl = { + 'neutral': neutral, + 'all': neutral, +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/jokes_it.py new/pyjokes-0.6.0/pyjokes/jokes_it.py --- old/pyjokes-0.5.0/pyjokes/jokes_it.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokes/jokes_it.py 2019-03-10 00:16:23.000000000 +0100 @@ -0,0 +1,182 @@ +# -*- coding: utf-8 -*- + +""" +Jokes from stackoverflow - provided under CC BY-SA 3.0 +http://stackoverflow.com/questions/234075/what-is-your-best-programmer-joke?page=4&tab=votes#tab-top +""" + +neutral = [ + "Trionfalmente, Beth ha rimosso Python 2.7 dal server nel 2020.'Finalmente!' ha detto con gioia, solo per vedere l'annuncio di Python 4.4.", + "Una query SQL entra in un bar, cammina verso a due table e chiede: 'Posso unirvi?'.", + "Quando il tuo martello e` C ++, tutto inizia a sembrare un pollice.", + "Se metti un milione di scimmie su un milione di tastiere, uno di loro alla fine scrivera` un programma Java, il resto scrivera` Perl.", + "Per comprendere la ricorsione devi prima capire la ricorsione.", + "Gli amici non permettono agli amici di usare Python 2.7.", + "Ho suggerito di tenere un 'Python Object Oriented Programming Seminar', ma l'acronimo era impopolare.", + "'toc, toc'. 'Chi e` la`?' ... pausa molto lunga ... Java.", + "Quanti programmatori ci vogliono per cambiare una lampadina? Nessuno, e` un problema hardware.", + "Qual e` il modo orientato agli oggetti per diventare ricchi? Ereditarieta`.", + "Quanti programmatori ci vogliono per cambiare una lampadina? Nessuno, possono rendere l'oscurita` uno standard.", + "I vecchi programmatori C non muoiono, sono solo gettati nel void.", + "Gli sviluppatori di software amano risolvere i problemi: se non ci sono problemi facilmente disponibili li creeranno.", + ".NET e` stato chiamato .NET in modo che non si visualizzasse in un elenco di directory Unix.", + "Hardware: la parte di un computer che puoi calciare.", + "Un programmatore e` stato trovato morto nella doccia, accanto al corpo c'era uno shampoo con le istruzioni:Insapona, risciacqua ripeti.", + "Ottimista: il bicchiere e` mezzo pieno Pessimista: il bicchiere e` mezzo vuoto Programmatore: il bicchiere e` il doppio del necessario.", + "In C abbiamo dovuto codificare i nostri bug. In C ++ possiamo ereditarli.", + "Come mai non c'e` una gara Perl offuscato? Perche` tutti vincerebbero.", + "Se riproduci un CD di Windows all'indietro, ascolterai il canto satanico ... peggio ancora, se lo riproduci in avanti, installa Windows.", + "Quanti programmatori ci vogliono per uccidere uno scarafaggio? Due: uno tiene, l'altro installa Windows su di esso.", + "Come si chiama un programmatore finlandese? Nerdic.", + "Cosa ha detto il codice Java al codice C? : Non hai classe.", + "Perche` Microsoft ha chiamato il proprio motore di ricerca BING? Because It's Not Google.", + "I venditori di software e i venditori di auto usate si differenziano perche` questi ultimi sanno quando mentono.", + "Bambino: 'papa', perche` il sole sorge ad est e tramonta ad ovest?' Papa': 'figlio, sta funzionando, non toccarlo'.", + "Quanti programmatori Prolog ci vogliono per cambiare una lampadina? Falso.", + "I veri programmatori possono scrivere codice assembly in qualsiasi lingua.", + "Cameriere: 'le piacerebbe un caffe` o un te`?' Programmatore: 'Si'.", + "Un programmatore entra in un foo ...", + "Qual e` il secondo nome di Benoit B. Mandelbrot? Benoit B. Mandelbrot.", + "Perche` sorridi sempre? Questa e` solo la mia ... espressione regolare.", + "Domanda stupida ASCII, ottiene uno stupido ANSI.", + "Un programmatore aveva un problema: penso` tra se stesso: 'lo risolvo con i threads!', ora ha due problemi.", + "Java: scrivi una volta e scappa.", + "Ti direi una battuta su UDP, ma non lo capiresti mai.", + "Un ingegnere di QA entra in un bar, si imbatte in un bar, striscia in un bar, balla in un bar, punta i piedi in un bar...", + "Ho avuto un problema quindi ho pensato di utilizzare Java. Ora ho una ProblemFactory.", + "L'ingegnere del QA entra in un bar, ordina una birra, ordina 0 birre, 99999 birre, una lucertola, -1 birre, uno sfdeljknesv.", + "Un responsabile di prodotto entra in un bar, chiede un drink, il barista dice NO, ma prendera` in considerazione l'aggiunta successiva.", + "Come si genera una stringa casuale? Metti uno studente di Informatica del primo anno davanti a Vim e gli chiedi di salvare ed uscire.", + "Uso Vim da molto tempo ormai, principalmente perche` non riesco a capire come uscire.", + "Come fai a sapere se una persona e` un utente Vim? Non ti preoccupare, te lo diranno.", + "un cameriere urla: 'sta soffocando! Qualcuno e` un dottore?' Programmatore: 'sono un utente Vim'.", + "3 Database Admins sono entrati in un bar NoSQL e poco dopo sono usciti perche` non sono riusciti a trovare un table.", + "Come spiegare il film Inception a un programmatore? Quando esegui una VM dentro una VM dentro un' altra VM tutto procede molto lentamente.", + "Come si chiama un pappagallo che dice 'Squawk! Pezzi di nove! Pezzi di nove!' Un errore a pappagallo.", + "Ci sono solo due problemi difficili in Informatica: invalidazione della cache, denominazione delle cose e errori di off-by-one.", + "Ci sono 10 tipi di persone: quelli che comprendono il binario e quelli che non lo sanno.", + "Ci sono 2 tipi di persone: quelli che possono estrapolare dati da insiemi incompleti ...", + "Esistono II tipi di persone: quelli che comprendono i numeri romani e quelli che non li conoscono.", + "Ci sono 10 tipi di persone: quelli che comprendono l'esadecimale e altri 15.", + "Ci sono 10 tipi di persone: quelli che capiscono il trinario, quelli che non lo fanno e quelli che non ne hanno mai sentito parlare.", + "Come chiami otto hobbit? Un hob byte.", + "La cosa migliore di un booleano e` che anche se ti sbagli, sei solo fuori di un bit.", + "Un buon programmatore e` qualcuno che guarda sempre in entrambe le direzioni prima di attraversare una strada a senso unico.", + "Esistono due modi per scrivere programmi privi di errori: solo il terzo funziona.", + "I controlli di qualita` consistono nel 55% di acqua, 30% di sangue e 15% di ticket in Jira.", + "Quanti QA servono per cambiare una lampadina? Hanno notato che la stanza era buia,: non risolvono i problemi, li trovano.", + "Un programmatore si schianta contro un'auto , l'uomo chiede 'cosa e` successo', l'altro risponde'Non so. Facciamo il backup e riprova'.", + "Scrivere PHP e` come fare pipi` in piscina, tutti lo hanno fatto, ma non hanno bisogno di renderlo pubblico.", + "Numero di giorni da quando ho riscontrato un errore di indice di array: -1.", + "gli appuntamenti veloci sono inutili, 5 minuti non sono sufficienti per spiegare correttamente i benefici della filosofia Unix.", + "Microsoft ha ogni quindici giorni una 'settimana produttiva' dove usa Google invece di Bing.", + "Trovare un buon sviluppatore PHP e` come cercare un ago in un pagliaio o e` un hackstack in un ago?.", + "Unix e` user friendly, e` solo molto particolare nella scelta di chi siano i suoi amici.", + "Un programmatore COBOL guadagna milioni con la riparazione Y2K e decide di congelarsi criogenicamente. L'anno e` 9999.", + "Il linguaggio C combina tutta la potenza del linguaggio assembly con tutta la facilita` d'uso del linguaggio assembly.", + "Un esperto SEO entra in un bar, pub, pub irlandese, taverna, barista, birra, liquore, vino, alcolici, liquori ...", + "Che cosa significa Emacs? Utilizzato esclusivamente dagli scienziati informatici di mezza eta`.", + "Che cosa hanno in comune le battute di PyJokes con Adobe Flash? Si aggiornano sempre, ma non migliorano.", + "Quanti demosceners sono necessari per cambiare una lampadina? Meta`. Con uno intero non ci sono sfide.", +] + +""" +Jokes from The Internet Chuck Norris DB (ICNDB) (http://www.icndb.com/) - provided under CC BY-SA 3.0 +http://api.icndb.com/jokes/ +""" + +chuck = [ + "Tutti gli array che Chuck Norris dichiara sono di dimensioni infinite, perche` Chuck Norris non conosce limiti.", + "Chuck Norris non ha la latenza del disco perche` il disco rigido sa sbrigarsi, altrimenti sono guai.", + "Chuck Norris scrive codice che si ottimizza da solo.", + "Chuck Norris non puo` testare l'uguaglianza perche` non ha eguali.", + "Chuck Norris non ha bisogno di garbage collection perche` non chiama .Dispose (), chiama .DropKick ().", + "Il primo programma di Chuck Norris e` stato kill -9.", + "Chuck Norris ha scoppiato la bolla delle dot com.", + "Tutti i browser supportano le definizioni esadecimali #chuck e #norris per i colori nero e blu.", + "MySpace non e` proprio il tuo spazio, e` di Chuck (te lo lascia solo usare).", + "Chuck Norris puo` scrivere funzioni infinitamente ricorsive e farle tornare.", + "Chuck Norris puo` risolvere le Torri di Hanoi in una mossa.", + "L'unico modello di design che Chuck Norris conosce e` il God Object Pattern.", + "Chuck Norris ha terminato World of Warcraft.", + "I project manager non chiedono mai a Chuck Norris le stime.", + "Chuck Norris non usa gli standard web in quanto il web si conformera` a lui.", + "'Funziona sulla mia macchina' e` sempre vero per Chuck Norris.", + "Chuck Norris non fa i grafici di Burn Down, fa i grafici di Smack Down.", + "Chuck Norris puo` cancellare il cestino.", + "La barba di Chuck Norris puo` scrivere 140 parole al minuto.", + "Chuck Norris puo` testare tutte le applicazioni con un'unica affermazione, 'funziona'.", + "La tastiera di Chuck Norris non ha un tasto Ctrl perche` niente controlla Chuck Norris.", + "Chuck Norris puo` far traboccare il tuo stack solo guardandolo.", + "Per Chuck Norris, tutto contiene una vulnerabilita`.", + "Chuck Norris non usa sudo, la shell sa solo che e` lui e fa quello che gli viene detto.", + "Chuck Norris non ha bisogno di un debugger, si limita a fissare il codice finche` non confessa.", + "Chuck Norris puo` accedere a metodi privati.", + "Chuck Norris puo` istanziare una classe astratta.", + "L'oggetto classe eredita da Chuck Norris.", + "Chuck Norris conosce l'ultima cifra del Pi greco.", + "La connessione di Chuck Norris e` piu' veloce in up che in down perche` i dati sono incentivati a correre via da lui.", + "Nessuna affermazione puo` prendere la ChuckNorrisException.", + "Chuck Norris puo` scrivere applicazioni multi-thread con un singolo thread.", + "Chuck Norris non ha bisogno di usare AJAX perche` le pagine hanno troppa paura di postback comunque.", + "Chuck Norris non usa la riflessione, la riflessione chiede educatamente il suo aiuto.", + "Non c'e` alcun tasto Esc sulla tastiera di Chuck Norris, perche` nessuno sfugge a Chuck Norris.", + "Chuck Norris puo` eseguire la ricerca binaria di dati non ordinati.", + "Chuck Norris non ha bisogno di tentativi di cattura, le eccezioni sono troppo spaventate da sollevarsi.", + "Chuck Norris e` uscito da un ciclo infinito.", + "Se Chuck Norris scrive codice con bug, gli errori si risolvono da soli.", + "L'hosting di Chuck Norris e` garantito al 101% di uptime.", + "La tastiera di Chuck Norris ha il tasto Any.", + "Chuck Norris puo` accedere al database dall'interfaccia utente.", + "I programmi di Chuck Norris non escono mai, sono terminati.", + "I programmi di Chuck Norris occupano il 150% della CPU, anche quando non sono in esecuzione.", + "Chuck Norris puo` generare thread che si completano prima di essere avviati.", + "I programmi di Chuck Norris non accettano input.", + "Chuck Norris puo` installare iTunes senza installare Quicktime.", + "Chuck Norris non ha bisogno di un sistema operativo.", + "Il modello di rete OSI di Chuck Norris ha un solo livello: fisico.", + "Chuck Norris puo` compilare errori di sintassi.", + "Chuck Norris non ha bisogno di digitare cast. Il Chuck-Norris Compiler (CNC) vede attraverso le cose, fino in fondo sempre.", + "Chuck Norris comprime i suoi file con un calcio rotante sul disco rigido.", + "Con Chuck Norris P = NP. Non c'e` alcun nondeterminismo con le decisioni di Chuck Norris.", + "Chuck Norris puo` recuperare qualsiasi cosa da / dev / null.", + "Nessuno ha mai programmato in coppia con Chuck Norris ed e`vissuto per raccontare la storia.", + "Nessuno ha mai parlato durante la revisione del codice di Chuck Norris ed e` vissuto per raccontare la storia.", + "Chuck Norris non usa una GUI, preferisce la linea di comando.", + "Chuck Norris non usa Oracle, lui e` l'Oracle.", + "Chuck Norris puo` dereferenziare NULL.", + "Una differenza tra il tuo codice e quello di Chuck Norris e` infinita.", + "Il plugin Chuck Norris Eclipse e` diventato un contatto alieno.", + "Chuck Norris e` l'ultimo mutex, tutti i thread lo temono.", + "Non preoccuparti dei test, i test case di Chuck Norris coprono anche il tuo codice.", + "Le dichiarazioni del registro di Chuck Norris sono sempre al livello FATAL.", + "Chuck Norris ha completato World of Warcraft.", + "Quando Chuck Norris rompe la build, non e` possibile risolverla, perche` non c'e` una sola riga di codice.", + "Chuck Norris scrive con un dito, lo punta alla tastiera e la tastiera fa il resto.", + "I programmi di Chuck Norris possono superare il test di Turing fissando l'interrogatore.", + "Se provi kill -9 con i programmi di Chuck Norris, si ritorce contro.", + "Chuck Norris esegue loop infiniti in meno di 4 secondi.", + "Chuck Norris puo` sovrascrivere una variabile bloccata.", + "Chuck Norris conosce il valore di NULL.", + "Chuck Norris puo` installare un sistema operativo a 64 bit su macchine a 32 bit.", + "Chuck Norris puo` scrivere su un flusso di output.", + "Chuck Norris puo` leggere da un flusso di input.", + "Chuck Norris non ha mai scritto il suo programma in codice macchina. Le macchine hanno imparato a interpretare il codice di Chuck Norris.", + "I test unitari di Chuck Norris non girano, muoiono.", + "Chuck Norris causa la schermata blu della morte.", + "Chuck Norris puo` fare una classe che e` sia astratta che finale.", + "Chuck Norris potrebbe usare qualsiasi cosa in java.util.* per ucciderti, inclusi i javadoc.", + "Il codice gira piu` velocemente quando Chuck Norris lo guarda.", + "Chuck Norris non usa REST, lui aspetta.", + "Su Facebook a tutti piace Chuck Norris, che lo scelgano o no.", + "Non puoi seguire Chuck Norris su Twitter, perche` lui ti segue.", + "La calcolatrice di Chuck Norris ha solo 3 tasti: 0, 1 e NAND.", + "Chuck Norris utilizza solo variabili globali. Non ha nulla da nascondere.", + "Chuck Norris scrive direttamente in binario. Quindi scrive il codice sorgente come documentazione per altri programmatori.", +] + +jokes_it = { + 'neutral': neutral, + 'chuck': chuck, + 'all': neutral + chuck, +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes/pyjokes.py new/pyjokes-0.6.0/pyjokes/pyjokes.py --- old/pyjokes-0.5.0/pyjokes/pyjokes.py 2015-09-21 00:38:52.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes/pyjokes.py 2019-03-10 00:16:23.000000000 +0100 @@ -4,12 +4,17 @@ from .jokes_en import jokes_en from .jokes_de import jokes_de from .jokes_es import jokes_es - +from .jokes_gl import jokes_gl +from .jokes_eu import jokes_eu +from .jokes_it import jokes_it all_jokes = { 'en': jokes_en, 'de': jokes_de, 'es': jokes_es, + 'gl': jokes_gl, + 'eu': jokes_eu, + 'it': jokes_it, } @@ -26,9 +31,9 @@ Parameters ---------- category: str - Choices: 'neutral', 'adult', 'chuck', 'all' + Choices: 'neutral', 'chuck', 'all', 'twister' lang: str - Choices: 'en', 'de', 'es' + Choices: 'en', 'de', 'es', 'gl', 'eu', 'it' Returns ------- @@ -51,9 +56,9 @@ Parameters ---------- category: str - Choices: 'neutral', 'adult', 'chuck', 'all' + Choices: 'neutral', 'chuck', 'all', 'twister' lang: str - Choices: 'en', 'de', 'es' + Choices: 'en', 'de', 'es', 'gl', 'eu', 'it' Returns ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes.egg-info/PKG-INFO new/pyjokes-0.6.0/pyjokes.egg-info/PKG-INFO --- old/pyjokes-0.5.0/pyjokes.egg-info/PKG-INFO 2015-09-21 01:37:22.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes.egg-info/PKG-INFO 2019-08-14 22:46:29.000000000 +0200 @@ -1,13 +1,15 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: pyjokes -Version: 0.5.0 +Version: 0.6.0 Summary: One line jokes for programmers (jokes as a service) -Home-page: https://github.com/pyjokes/pyjokes +Home-page: https://pyjok.es/ Author: Pyjokes Society -Author-email: UNKNOWN -License: BSD +Author-email: [email protected] +License: BSD License Description: .. image:: https://travis-ci.org/pyjokes/pyjokes.svg :target: https://travis-ci.org/pyjokes/pyjokes + .. image:: https://coveralls.io/repos/pyjokes/pyjokes/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/pyjokes/pyjokes?branch=master ======= pyjokes @@ -25,18 +27,20 @@ Usage ===== - Once installed, simply call `pyjoke` from the command line. + Once installed, simply call `pyjoke` from the command line or add it to your + .bashrc file to see a joke every time you open a terminal. - Alternatively use the `-c` flag to get jokes from a specific category. Options:: + Use the `-c` flag to get jokes from a specific category. Options:: -c neutral [default] (neutral geek jokes) - -c adult (adult geek jokes) -c chuck (Chuck Norris geek jokes) -c all (all jokes) + -c twister (Tongue-twister) - You can also access the jokes in your own project by importing `pyjokes` and using the functions `get_joke` and `get_jokes` + You can also access the jokes in your own project by importing `pyjokes` and + using the functions `get_joke` and `get_jokes`. - Comprehensive documentation is available at `http://pyjoke.es`_ + Documentation is available at https://pyjok.es/ Contributors ============ @@ -55,6 +59,10 @@ * `Yash Mehrotra`_ * `Marc Kirkwood`_ * `Gregory Parker`_ + * `Martin O'Hanlon`_ + * `Graham Markall`_ + * `Andreas Reinle`_ + Contributing ============ @@ -66,23 +74,15 @@ * Feel free to contribute jokes (via pull request or `proposal issue`_) * See the `contributing policy`_ on GitHub - Tests - ===== - - Install requirements (pytest) - - Run tests:: - - python setup.py test - Pyjokes Society =============== - This project is was founded at `PySS 2014`_ and is directed by the `Pyjokes Society`_. + This project was founded at `PySS 2014`_ and is directed by the + `Pyjokes Society`_. - .. _documentation: http://pyjoke.es/install/ - .. _http://pyjoke.es: http://pyjoke.es + .. _documentation: http://pyjok.es/install/ + .. _http://pyjok.es: http://pyjok.es/ .. _Ben Nuttall: https://github.com/bennuttall .. _Alex Savio: https://github.com/alexsavio .. _Borja Ayerdi: https://github.com/borjaayerdi @@ -92,6 +92,9 @@ .. _Yash Mehrotra: https://github.com/yashmehrotra .. _Marc Kirkwood: https://github.com/trojjer .. _Gregory Parker: https://github.com/ElectronicsGeek + .. _Martin O'Hanlon: https://github.com/martinohanlon + .. _Graham Markall: https://github.com/gmarkall + .. _Andreas Reinle: https://github.com/gras64 .. _BSD Licence: http://opensource.org/licenses/BSD-3-Clause .. _GitHub: https://github.com/pyjokes/pyjokes .. _GitHub Issues: https://github.com/pyjokes/pyjokes/issues @@ -101,10 +104,12 @@ .. _PySS 2014: http://www.pyss.org/ .. _Pyjokes Society: http://pyjok.es/society/ -Keywords: pyjokes,jokes -Platform: UNKNOWN +Keywords: pyjokes,pyjokes,jokes,joke +Platform: ALL Classifier: Development Status :: 4 - Beta Classifier: Topic :: Utilities Classifier: License :: OSI Approved :: BSD License Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 3 +Provides-Extra: test +Provides-Extra: doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes.egg-info/SOURCES.txt new/pyjokes-0.6.0/pyjokes.egg-info/SOURCES.txt --- old/pyjokes-0.5.0/pyjokes.egg-info/SOURCES.txt 2015-09-21 01:37:22.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes.egg-info/SOURCES.txt 2019-08-14 22:46:29.000000000 +0200 @@ -5,10 +5,16 @@ pyjokes/jokes_de.py pyjokes/jokes_en.py pyjokes/jokes_es.py +pyjokes/jokes_eu.py +pyjokes/jokes_gl.py +pyjokes/jokes_it.py pyjokes/pyjokes.py pyjokes.egg-info/PKG-INFO pyjokes.egg-info/SOURCES.txt pyjokes.egg-info/dependency_links.txt +pyjokes.egg-info/entry_points.txt +pyjokes.egg-info/requires.txt pyjokes.egg-info/top_level.txt -scripts/pyjoke -scripts/pyjokes \ No newline at end of file +pyjokescli/__init__.py +pyjokescli/pyjoke.py +pyjokescli/pyjokes.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes.egg-info/entry_points.txt new/pyjokes-0.6.0/pyjokes.egg-info/entry_points.txt --- old/pyjokes-0.5.0/pyjokes.egg-info/entry_points.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokes.egg-info/entry_points.txt 2019-08-14 22:46:29.000000000 +0200 @@ -0,0 +1,4 @@ +[console_scripts] +pyjoke = pyjokescli.pyjoke:main +pyjokes = pyjokescli.pyjokes:main + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes.egg-info/requires.txt new/pyjokes-0.6.0/pyjokes.egg-info/requires.txt --- old/pyjokes-0.5.0/pyjokes.egg-info/requires.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokes.egg-info/requires.txt 2019-08-14 22:46:29.000000000 +0200 @@ -0,0 +1,8 @@ + +[doc] +mkdocs + +[test] +pytest +coverage +tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokes.egg-info/top_level.txt new/pyjokes-0.6.0/pyjokes.egg-info/top_level.txt --- old/pyjokes-0.5.0/pyjokes.egg-info/top_level.txt 2015-09-21 01:37:22.000000000 +0200 +++ new/pyjokes-0.6.0/pyjokes.egg-info/top_level.txt 2019-08-14 22:46:29.000000000 +0200 @@ -1 +1,2 @@ pyjokes +pyjokescli diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokescli/pyjoke.py new/pyjokes-0.6.0/pyjokescli/pyjoke.py --- old/pyjokes-0.5.0/pyjokescli/pyjoke.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokescli/pyjoke.py 2019-08-14 15:14:51.000000000 +0200 @@ -0,0 +1,52 @@ +import os +import argparse +from pyjokes import pyjokes + + +def create_argparser(): + parser = argparse.ArgumentParser( + description='One line jokes for programmers (jokes as a service)' + ) + + parser.add_argument( + '-c', '--category', + dest='category', + choices=['neutral', 'chuck', 'all', 'twister'], + default='neutral', + help='Joke category.' + ) + + parser.add_argument( + '-l', '--language', + dest='language', + choices=['en', 'de', 'es', 'gl', 'eu', 'it'], + default='en', + help='Joke language.' + ) + + return parser + + +def main(): + parser = create_argparser() + + try: + args = parser.parse_args() + except argparse.ArgumentError as exc: + print('Error parsing arguments.') + parser.error(str(exc.message)) + exit(-1) + + try: + joke = pyjokes.get_joke(language=args.language, category=args.category) + except pyjokes.LanguageNotFoundError: + print('No such language %s' % args.language) + exit(-1) + except pyjokes.CategoryNotFoundError: + print('No such category %s' % args.category) + exit(-1) + + print(joke) + +if __name__ == '__main__': + main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/pyjokescli/pyjokes.py new/pyjokes-0.6.0/pyjokescli/pyjokes.py --- old/pyjokes-0.5.0/pyjokescli/pyjokes.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pyjokes-0.6.0/pyjokescli/pyjokes.py 2019-08-14 15:14:51.000000000 +0200 @@ -0,0 +1,9 @@ +import sys + + +def main(): + print('Did you mean pyjoke?') + return 1 + +if __name__ == '__main__': + sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/scripts/pyjoke new/pyjokes-0.6.0/scripts/pyjoke --- old/pyjokes-0.5.0/scripts/pyjoke 2015-09-20 23:11:32.000000000 +0200 +++ new/pyjokes-0.6.0/scripts/pyjoke 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -#!/usr/bin/env python - -import os -import argparse -from pyjokes import pyjokes - - -def create_argparser(): - parser = argparse.ArgumentParser( - description='One line jokes for programmers (jokes as a service)' - ) - - parser.add_argument( - '-c', '--category', - dest='category', - choices=['neutral', 'adult', 'chuck', 'all'], - default='neutral', - help='Joke category.' - ) - - parser.add_argument( - '-l', '--language', - dest='language', - choices=['en', 'de', 'es'], - default='en', - help='Joke language.' - ) - - return parser - - -def main(): - parser = create_argparser() - - try: - args = parser.parse_args() - except argparse.ArgumentError as exc: - print('Error parsing arguments.') - parser.error(str(exc.message)) - exit(-1) - - try: - joke = pyjokes.get_joke(language=args.language, category=args.category) - except pyjokes.LanguageNotFoundError: - print('No such language %s' % args.language) - exit(-1) - except pyjokes.CategoryNotFoundError: - print('No such category %s' % args.category) - exit(-1) - - print(joke) - -if __name__ == '__main__': - main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/scripts/pyjokes new/pyjokes-0.6.0/scripts/pyjokes --- old/pyjokes-0.5.0/scripts/pyjokes 2015-09-06 23:17:32.000000000 +0200 +++ new/pyjokes-0.6.0/scripts/pyjokes 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import sys - - -def main(): - print('Did you mean pyjoke?') - return 1 - -if __name__ == '__main__': - sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/setup.cfg new/pyjokes-0.6.0/setup.cfg --- old/pyjokes-0.5.0/setup.cfg 2015-09-21 01:37:22.000000000 +0200 +++ new/pyjokes-0.6.0/setup.cfg 2019-08-14 22:46:29.000000000 +0200 @@ -1,5 +1,4 @@ [egg_info] -tag_svn_revision = 0 -tag_date = 0 tag_build = +tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyjokes-0.5.0/setup.py new/pyjokes-0.6.0/setup.py --- old/pyjokes-0.5.0/setup.py 2015-09-21 01:35:37.000000000 +0200 +++ new/pyjokes-0.6.0/setup.py 2019-08-14 15:49:56.000000000 +0200 @@ -1,55 +1,40 @@ -import os +"Setup script for the pyjokes package" + import sys -from setuptools import setup, find_packages -from setuptools.command.test import test as TestCommand +from setuptools import setup, find_packages +import os def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -class PyTest(TestCommand): - user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] +def main(): + "Executes setup when this script is the top-level" + import pyjokes as app + + setup( + name=app.__project__, + version=app.__version__, + description=app.__doc__, + long_description=read('README.rst'), + classifiers=app.__classifiers__, + author=app.__author__, + author_email=app.__author_email__, + url=app.__url__, + license=[ + c.rsplit('::', 1)[1].strip() + for c in app.__classifiers__ + if c.startswith('License ::') + ][0], + keywords=app.__keywords__, + packages=find_packages(), + include_package_data=True, + platforms=app.__platforms__, + entry_points=app.__entry_points__, + install_requires=app.__requires__, + extras_require=app.__extra_requires__, + ) - def initialize_options(self): - TestCommand.initialize_options(self) - self.pytest_args = [] - - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - #import here, cause outside the eggs aren't loaded - import pytest - errno = pytest.main(self.pytest_args) - sys.exit(errno) - - -setup( - name="pyjokes", - version="0.5.0", - author="Pyjokes Society", - description="One line jokes for programmers (jokes as a service)", - license="BSD", - keywords=[ - "pyjokes", - "jokes", - ], - url="https://github.com/pyjokes/pyjokes";, - packages=find_packages(), - long_description=read('README.rst'), - scripts=['scripts/pyjoke', - 'scripts/pyjokes'], - classifiers=[ - "Development Status :: 4 - Beta", - "Topic :: Utilities", - "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 3", - ], - #test requirements and class specification: - tests_require=['pytest'], - cmdclass={ 'test' : PyTest }, -) +if __name__ == '__main__': + main()
