[kde-doc-english] [kajongg] /: whitespace fixes, and remove duplicate vg.supp
Wolfgang Rohdewald
wolfgang at rohdewald.de
Wed May 21 06:29:51 UTC 2014
Git commit d1ffeb541402b86b0ff0675be1822e24ca3c1b09 by Wolfgang Rohdewald.
Committed on 21/05/2014 at 06:04.
Pushed by wrohdewald into branch 'master'.
whitespace fixes, and remove duplicate vg.supp
M +1 -1 CMakeLists.txt
M +1 -2 Messages.sh
M +0 -1 README
M +0 -1 README.packagers
M +1 -2 README.windows
M +2 -2 bash_completion.d/kajongg
M +1 -1 cmake-modules/COPYING-CMAKE-SCRIPTS
M +3 -3 doc/index.docbook
M +0 -1 setup.py
M +1 -1 src/check_unused
D +0 -60 src/fixdeclmj
M +1 -1 src/login.py
M +11 -14 src/pylintrc
M +0 -1 src/qstring.py
M +0 -2 src/vg.supp
D +0 -391 vg.supp
http://commits.kde.org/kajongg/d1ffeb541402b86b0ff0675be1822e24ca3c1b09
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef29d3e..b241377 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ set(PROGRAM_VERSION 4.6.0)
add_subdirectory( voices )
add_subdirectory( doc )
-set(SRCFILES
+set(SRCFILES
src/permutations.py
src/about.py
src/animation.py
diff --git a/Messages.sh b/Messages.sh
index aa7279f..57b9d96 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -3,7 +3,7 @@
# http://api.kde.org/4.0-api/kdelibs-apidocs/kdecore/html/classKLocalizedString.html
# extract messages from *.py
-# currently, the .pot lives at
+# currently, the .pot lives at
# http://websvn.kde.org/trunk/l10n-kde4/templates/messages/playground-games/kajongg.pot
${EXTRACTRC:-extractrc} src/*.ui src/*.rc >> rc.cpp
@@ -18,4 +18,3 @@ ${XGETTEXT:-xgettext} \
-kcreateRule:1 \
--no-wrap --msgid-bugs-address=wolfgang at rohdewald.de -o${podir:-.}/kajongg.pot \
rc.cpp `find . -name \*.py`
-
diff --git a/README b/README
index 53f4fd8..d2abdc1 100644
--- a/README
+++ b/README
@@ -52,4 +52,3 @@ menu commmand Help / Report Bug or mail me directly to the Mail
Address given in that bug reporting dialog. I will not follow links
to pages I do not trust like upload pages, shortlink services or
similar.
-
diff --git a/README.packagers b/README.packagers
index b6848a6..bfeb6f2 100644
--- a/README.packagers
+++ b/README.packagers
@@ -3,4 +3,3 @@ at the file debian.control
all content of debian.control is used by make_debian_package,
so its syntax must follow debian package rules
-
diff --git a/README.windows b/README.windows
index 32d8c53..f348242 100644
--- a/README.windows
+++ b/README.windows
@@ -9,7 +9,7 @@ cd kajongg/src
./winprep.py # generates a directory "share" with files to be installed
when using Python2.7 with PyQt4:
-goto C:\Python27\Lib\site-packages\PyQt4\uic\ and rename the dictionary
+goto C:\Python27\Lib\site-packages\PyQt4\uic\ and rename the dictionary
"port_v3" into something else like "port_v3_".
Reason: http://www.riverbankcomputing.com/pipermail/pyqt/2013-June/032883.html
@@ -19,4 +19,3 @@ must work
cd src ; python setup.py bdist_msi
the result is in src/dist
-
diff --git a/bash_completion.d/kajongg b/bash_completion.d/kajongg
index 65a74b7..4e01069 100644
--- a/bash_completion.d/kajongg
+++ b/bash_completion.d/kajongg
@@ -1,8 +1,8 @@
-_kajongg()
+_kajongg()
{
_rulesets()
{
- ${COMP_WORDS[0]} --rulesets
+ ${COMP_WORDS[0]} --rulesets
}
local cur prev opts
COMPREPLY=()
diff --git a/cmake-modules/COPYING-CMAKE-SCRIPTS b/cmake-modules/COPYING-CMAKE-SCRIPTS
index 4b41776..53b6b71 100644
--- a/cmake-modules/COPYING-CMAKE-SCRIPTS
+++ b/cmake-modules/COPYING-CMAKE-SCRIPTS
@@ -7,7 +7,7 @@ are met:
2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
+3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/doc/index.docbook b/doc/index.docbook
index af3bb57..590efd2 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -82,7 +82,7 @@
</para>
<para>
&kajongg; can be used in two different ways: Scoring a manual game where you play as always without the help of a computer and use &kajongg; for the computation of scores and for bookkeeping. Or you can use &kajongg; to play against any combination of other human players or computer players.
-
+
</para>
</chapter>
@@ -176,7 +176,7 @@
</mediaobject>
</screenshot>
<para>
- This is the window for entering hand results. It automatically shows itself when &kajongg; thinks you might need it. You can always show or hide it by pressing <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> or by selecting the corresponding menu entry.
+ This is the window for entering hand results. It automatically shows itself when &kajongg; thinks you might need it. You can always show or hide it by pressing <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> or by selecting the corresponding menu entry.
</para>
<para>
As always the prevailing wind has its background colored.
@@ -188,7 +188,7 @@
After having entered all relevant data for a hand, press the button <guibutton>Save Hand</guibutton>. The hand values will be entered in the data base, and they are also shown in the score table. You might be prompted to change the seating positions of the players but you can choose not to change seats. The proposed changes are currently not customizable - if a ruleset needs something different, we will change that.
</para>
<para>
- If the player might have won, the check box in the column "Winner" will be enabled - click this for the winner.
+ If the player might have won, the check box in the column "Winner" will be enabled - click this for the winner.
</para>
<para>
The status bar will now show the updated balances for the players, and you can continue with the next hand.
diff --git a/setup.py b/setup.py
index e47cc21..4126088 100755
--- a/setup.py
+++ b/setup.py
@@ -120,4 +120,3 @@ setup(name='Kajongg',
'Intended Audience :: End Users/Desktop',
'Programming Language :: Python',],
**extra)
-
diff --git a/src/check_unused b/src/check_unused
index 6f341ee..1f86f5d 100755
--- a/src/check_unused
+++ b/src/check_unused
@@ -25,7 +25,7 @@ grep -he 'def .*\(.*\)' *py | sed 's/def //' | sed s'/(.*//' | sed 's/ //'g |
do
grep $name *py | grep -v "def $name" > /dev/null
if test $? -ne 0
- then
+ then
echo not used: $name
fi
done
diff --git a/src/fixdeclmj b/src/fixdeclmj
deleted file mode 100644
index 78695a9..0000000
--- a/src/fixdeclmj
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/player.py b/src/player.py
-index 02601da..4503fe9 100644
---- a/src/player.py
-+++ b/src/player.py
-@@ -449,16 +449,7 @@ class PlayingPlayer(Player):
- self.game.winner = self
- if withDiscard:
- assert isinstance(withDiscard, Tile), withDiscard
-- assert withDiscard == self.game.lastDiscard, 'withDiscard: %s lastDiscard: %s' % (
-- withDiscard, self.game.lastDiscard)
-- if Internal.scene:
-- discardTile = Internal.scene.discardBoard.lastDiscarded
-- if discardTile.tile != withDiscard:
-- self.game.debug('%s != %s' % (discardTile.tile, withDiscard))
-- assert False
-- else:
-- discardTile = withDiscard
-- self.addConcealedTiles([discardTile])
-+ PlayingPlayer.addConcealedTiles(self, [withDiscard]) # this should NOT invoke syncHandBoard
- melds = [Meld(x) for x in concealed.split()]
- if self.lastSource != 'k': # robbed the kong
- self.lastSource = 'd'
-@@ -466,6 +457,7 @@ class PlayingPlayer(Player):
- assert lastMeld in melds, '%s: concealed=%s melds=%s lastMeld=%s lastTile=%s withDiscard=%s' % (
- self._concealedTileNames, concealed, melds, lastMeld, lastTile, withDiscard)
- melds.remove(lastMeld)
-+ # TODO: use exposeMeld
- lastTile = withDiscard.lower()
- lastMeld = lastMeld.toLower()
- self._exposedMelds.append(lastMeld)
-@@ -478,7 +470,6 @@ class PlayingPlayer(Player):
- self._concealedMelds = melds
- self._concealedTileNames = []
- self._hand = None
-- self.syncHandBoard()
-
- def __possibleChows(self):
- """returns a unique list of lists with possible claimable chow combinations"""
-diff --git a/src/visible.py b/src/visible.py
-index 27cc544..d59e630 100644
---- a/src/visible.py
-+++ b/src/visible.py
-@@ -162,6 +162,17 @@ class VisiblePlayingPlayer(VisiblePlayer, PlayingPlayer):
- PlayingPlayer.addConcealedTiles(self, list(x.tile for x in uiTiles))
- self.syncHandBoard(uiTiles)
-
-+ def declaredMahJongg(self, concealed, withDiscard, lastTile, lastMeld):
-+ """player declared mah jongg. Determine last meld, show concealed tiles grouped to melds"""
-+ PlayingPlayer.declaredMahJongg(self, concealed, withDiscard, lastTile, lastMeld)
-+ if withDiscard:
-+ # withDiscard is a Tile, we need the UITile
-+ discardTile = Internal.scene.discardBoard.lastDiscarded
-+ if discardTile.tile != withDiscard:
-+ self.game.debug('%s != %s' % (discardTile.tile, withDiscard))
-+ assert False
-+ self.syncHandBoard([discardTile])
-+
- def removeTile(self, tile):
- """remove from my melds or tiles"""
- PlayingPlayer.removeTile(self, tile)
diff --git a/src/login.py b/src/login.py
index 81dadfb..0c9c723 100644
--- a/src/login.py
+++ b/src/login.py
@@ -449,7 +449,7 @@ class Connection(object):
@ruleset.setter
def ruleset(self, value):
"""save changed ruleset as last used ruleset for this server"""
- if self.__ruleset != value:
+ if self.__ruleset != value:
self.__ruleset = value
if value:
def write():
diff --git a/src/pylintrc b/src/pylintrc
index 385419f..c24ceb4 100644
--- a/src/pylintrc
+++ b/src/pylintrc
@@ -1,11 +1,11 @@
# lint Python modules using external checkers.
-#
+#
# This is the main checker controling the other ones and the reports
# generation. It is itself both a raw checker and an astng checker in order
# to:
# * handle message activation / deactivation at the module level
# * handle some basic but necessary stats'data (number of classes, methods...)
-#
+#
[MASTER]
# Specify a configuration file.
@@ -98,7 +98,7 @@ comment=no
# try to find bugs in the code using type inference
-#
+#
[TYPECHECK]
# Tells wether missing members accessed in mixin class should be ignored. A
@@ -127,7 +127,7 @@ acquired-members=REQUEST,acl_users,aq_parent
# * dangerous default values as arguments
# * redefinition of function / method / class
# * uses of the global statement
-#
+#
[BASIC]
# Required attributes for module, separated by a comma
@@ -180,7 +180,7 @@ bad-functions=map,filter,apply,input
# * undefined variables
# * redefinition of variable from builtins or from an outer scope
# * use of variable before assigment
-#
+#
[VARIABLES]
# Tells wether we should check for unused import in __init__ files.
@@ -199,7 +199,7 @@ additional-builtins=
# * relative / wildcard imports
# * cyclic imports
# * uses of deprecated modules
-#
+#
[IMPORTS]
# Deprecated modules which should not be used, separated by a comma
@@ -221,7 +221,7 @@ int-import-graph=
# checks for sign of poor/misdesign:
# * number of methods, attributes, local variables...
# * size, complexity of functions, methods
-#
+#
[DESIGN]
# Maximum number of arguments for function / method
@@ -259,7 +259,7 @@ max-public-methods=40
# * attributes not defined in the __init__ method
# * supported interfaces implementation
# * unreachable code
-#
+#
[CLASSES]
# List of interface methods to ignore, separated by a comma. This is used for
@@ -273,7 +273,7 @@ defining-attr-methods=__init__,__new__,setUp,setupUi,setupActions,setupUILastTil
# checks for similarities and duplicated code. This computation may be
# memory / CPU intensive, so you should disable it if you experiments some
# problems.
-#
+#
[SIMILARITIES]
# Minimum lines number of a similarity.
@@ -289,7 +289,7 @@ ignore-docstrings=yes
# checks for:
# * warning notes in the code like FIXME, XXX
# * PEP 263: source code with non ascii character but no encoding declaration
-#
+#
[MISCELLANEOUS]
# List of note tags to take in consideration, separated by a comma.
@@ -301,7 +301,7 @@ notes=FIXME,XXX
# * strict indentation
# * line length
# * use of <> instead of !=
-#
+#
[FORMAT]
# Maximum number of characters on a single line.
@@ -313,6 +313,3 @@ max-module-lines=1300
# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
# tab).
indent-string=' '
-
-
-
diff --git a/src/qstring.py b/src/qstring.py
index 7d3d06d..2b11b55 100644
--- a/src/qstring.py
+++ b/src/qstring.py
@@ -41,4 +41,3 @@ class QString(unicode):
def isEmpty(self):
"""is the QString empty?"""
return len(self) == 0
-
diff --git a/src/vg.supp b/src/vg.supp
index 15982cc..f3ed190 100644
--- a/src/vg.supp
+++ b/src/vg.supp
@@ -387,5 +387,3 @@
Memcheck:Value4
fun:SHA1_Update
}
-
-
diff --git a/vg.supp b/vg.supp
deleted file mode 100644
index 15982cc..0000000
--- a/vg.supp
+++ /dev/null
@@ -1,391 +0,0 @@
-#
-# This is a valgrind suppression file that should be used when using valgrind.
-#
-# Here's an example of running valgrind:
-#
-# cd python/dist/src
-# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
-# ./python -E -tt ./Lib/test/regrtest.py -u bsddb,network
-#
-# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
-# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.
-#
-# If you do not want to recompile Python, you can uncomment
-# suppressions for PyObject_Free and PyObject_Realloc.
-#
-# See Misc/README.valgrind for more information.
-
-# all tool names: Addrcheck,Memcheck,cachegrind,helgrind,massif
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 8 (x86_64 aka amd64)
- Memcheck:Value8
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:Py_ADDRESS_IN_RANGE
-}
-
-#
-# Leaks (including possible leaks)
-# Hmmm, I wonder if this masks some real leaks. I think it does.
-# Will need to fix that.
-#
-
-{
- Suppress leaking the GIL. Happens once per process, see comment in ceval.c.
- Memcheck:Leak
- fun:malloc
- fun:PyThread_allocate_lock
- fun:PyEval_InitThreads
-}
-
-{
- Suppress leaking the GIL after a fork.
- Memcheck:Leak
- fun:malloc
- fun:PyThread_allocate_lock
- fun:PyEval_ReInitThreads
-}
-
-{
- Suppress leaking the autoTLSkey. This looks like it shouldn't leak though.
- Memcheck:Leak
- fun:malloc
- fun:PyThread_create_key
- fun:_PyGILState_Init
- fun:Py_InitializeEx
- fun:Py_Main
-}
-
-{
- Hmmm, is this a real leak or like the GIL?
- Memcheck:Leak
- fun:malloc
- fun:PyThread_ReInitTLS
-}
-
-{
- Handle PyMalloc confusing valgrind (possibly leaked)
- Memcheck:Leak
- fun:realloc
- fun:_PyObject_GC_Resize
- fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING
-}
-
-{
- Handle PyMalloc confusing valgrind (possibly leaked)
- Memcheck:Leak
- fun:malloc
- fun:_PyObject_GC_New
- fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING
-}
-
-{
- Handle PyMalloc confusing valgrind (possibly leaked)
- Memcheck:Leak
- fun:malloc
- fun:_PyObject_GC_NewVar
- fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING
-}
-
-#
-# Non-python specific leaks
-#
-
-{
- Handle pthread issue (possibly leaked)
- Memcheck:Leak
- fun:calloc
- fun:allocate_dtv
- fun:_dl_allocate_tls_storage
- fun:_dl_allocate_tls
-}
-
-{
- Handle pthread issue (possibly leaked)
- Memcheck:Leak
- fun:memalign
- fun:_dl_allocate_tls_storage
- fun:_dl_allocate_tls
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:PyObject_Realloc
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:PyObject_Realloc
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:PyObject_Realloc
-}
-
-###
-### All the suppressions below are for errors that occur within libraries
-### that Python uses. The problems to not appear to be related to Python's
-### use of the libraries.
-###
-
-{
- Generic ubuntu ld problems
- Memcheck:Addr8
- obj:/lib/ld-2.4.so
- obj:/lib/ld-2.4.so
- obj:/lib/ld-2.4.so
- obj:/lib/ld-2.4.so
-}
-
-{
- Generic gentoo ld problems
- Memcheck:Cond
- obj:/lib/ld-2.3.4.so
- obj:/lib/ld-2.3.4.so
- obj:/lib/ld-2.3.4.so
- obj:/lib/ld-2.3.4.so
-}
-
-{
- DBM problems, see test_dbm
- Memcheck:Param
- write(buf)
- fun:write
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- fun:dbm_close
-}
-
-{
- DBM problems, see test_dbm
- Memcheck:Value8
- fun:memmove
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- fun:dbm_store
- fun:dbm_ass_sub
-}
-
-{
- DBM problems, see test_dbm
- Memcheck:Cond
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- fun:dbm_store
- fun:dbm_ass_sub
-}
-
-{
- DBM problems, see test_dbm
- Memcheck:Cond
- fun:memmove
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- obj:/usr/lib/libdb1.so.2
- fun:dbm_store
- fun:dbm_ass_sub
-}
-
-{
- GDBM problems, see test_gdbm
- Memcheck:Param
- write(buf)
- fun:write
- fun:gdbm_open
-
-}
-
-{
- ZLIB problems, see test_gzip
- Memcheck:Cond
- obj:/lib/libz.so.1.2.3
- obj:/lib/libz.so.1.2.3
- fun:deflate
-}
-
-{
- Avoid problems w/readline doing a putenv and leaking on exit
- Memcheck:Leak
- fun:malloc
- fun:xmalloc
- fun:sh_set_lines_and_columns
- fun:_rl_get_screen_size
- fun:_rl_init_terminal_io
- obj:/lib/libreadline.so.4.3
- fun:rl_initialize
-}
-
-###
-### These occur from somewhere within the SSL, when running
-### test_socket_sll. They are too general to leave on by default.
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Cond
-### fun:memset
-###}
-###{
-### somewhere in SSL stuff
-### Memcheck:Value4
-### fun:memset
-###}
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Cond
-### fun:MD5_Update
-###}
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Value4
-### fun:MD5_Update
-###}
-
-#
-# All of these problems come from using test_socket_ssl
-#
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_bin2bn
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_num_bits_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:BN_num_bits_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_mod_exp_mont_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_mod_exp_mont
-}
-
-{
- from test_socket_ssl
- Memcheck:Param
- write(buf)
- fun:write
- obj:/usr/lib/libcrypto.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:RSA_verify
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:RSA_verify
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:DES_set_key_unchecked
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:DES_encrypt2
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- obj:/usr/lib/libssl.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- obj:/usr/lib/libssl.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BUF_MEM_grow_clean
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:memcpy
- fun:ssl3_read_bytes
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:SHA1_Update
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:SHA1_Update
-}
-
-
More information about the kde-doc-english
mailing list