Merge in bugfixes

ikanobori · ikanobori · commit c1d2e145b3f1 · 2011-08-09T09:55:09.000Z
diff --git a/bpython/__init__.py b/bpython/__init__.py
@@ -23,6 +23,7 @@
 import os.path
 
 __version__ = 'mercurial'
+>>>>>>> other
 package_dir = os.path.abspath(os.path.dirname(__file__))
 
 
diff --git a/bpython/args.py b/bpython/args.py
@@ -83,7 +83,7 @@ def parse(args, extras=None, ignore_stdin=False):
     if options.version:
         print 'bpython version', __version__,
         print 'on top of Python', sys.version.split()[0]
-        print ('(C) 2008-2010 Bob Farrell, Andreas Stuehrk et al. '
+        print ('(C) 2008-2011 Bob Farrell, Andreas Stuehrk et al. '
                'See AUTHORS for detail.')
         raise SystemExit
 
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009-2010 the bpython authors.
+# Copyright (c) 2009-2011 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009-2010 Andreas Stuehrk
+# Copyright (c) 2009-2011 Andreas Stuehrk
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009-2010 the bpython authors.
+# Copyright (c) 2009-2011 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/pager.py b/bpython/pager.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009-2010 Andreas Stuehrk
+# Copyright (c) 2009-2011 Andreas Stuehrk
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009-2010 the bpython authors.
+# Copyright (c) 2009-2011 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -2,7 +2,7 @@
 #
 # The MIT License
 #
-# Copyright (c) 2010 Marien Zwart
+# Copyright (c) 2010-2011 Marien Zwart
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# The MIT License`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2009-2010 the bpython authors.`
	`3`	`+# Copyright (c) 2009-2011 the bpython authors.`
`4`	`4`	`#`
`5`	`5`	`# Permission is hereby granted, free of charge, to any person obtaining a copy`
`6`	`6`	`# of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# The MIT License`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2009-2010 Andreas Stuehrk`
	`3`	`+# Copyright (c) 2009-2011 Andreas Stuehrk`
`4`	`4`	`#`
`5`	`5`	`# Permission is hereby granted, free of charge, to any person obtaining a copy`
`6`	`6`	`# of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# The MIT License`
`4`	`4`	`#`
`5`		`-# Copyright (c) 2010 Marien Zwart`
	`5`	`+# Copyright (c) 2010-2011 Marien Zwart`
`6`	`6`	`#`
`7`	`7`	`# Permission is hereby granted, free of charge, to any person obtaining a copy`
`8`	`8`	`# of this software and associated documentation files (the "Software"), to deal`