Skip to content

Commit 713d362

Browse files
committed
fixup docs
1 parent b080cc2 commit 713d362

File tree

7 files changed

+25
-24
lines changed

7 files changed

+25
-24
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
build:
33
python3 setup.py build_ext -if
44

5+
.PHONY: doc
6+
doc:
7+
pip install .
8+
pip install sphinx
9+
cd doc && make html
510

611
.PHONY: clean
712
clean:

MySQLdb/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
from . import _mysql
1919

2020
if version_info != _mysql.version_info:
21-
raise ImportError("this is MySQLdb version %s, but _mysql is version %r" %
22-
(version_info, _mysql.version_info))
21+
raise ImportError("this is MySQLdb version %s, but _mysql is version %r\n_mysql: %r" %
22+
(version_info, _mysql.version_info, _mysql.__file__))
2323

2424
threadsafety = 1
2525
apilevel = "2.0"

doc/MySQLdb.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,23 @@ MySQLdb Package
4141
:undoc-members:
4242
:show-inheritance:
4343

44+
:mod:`_mysql` Module
45+
--------------------
46+
47+
.. automodule:: MySQLdb._mysql
48+
:members:
49+
:undoc-members:
50+
:show-inheritance:
51+
52+
:mod:`_exceptions` Module
53+
-------------------------
54+
55+
.. automodule:: MySQLdb._exceptions
56+
:members:
57+
:undoc-members:
58+
:show-inheritance:
59+
60+
4461
Subpackages
4562
-----------
4663

doc/_exceptions.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

doc/_mysql.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

doc/modules.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

doc/user_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ nextset()
546546
Some examples
547547
.............
548548

549-
The ``connect()`` method works nearly the same as with `_mysql`_::
549+
The ``connect()`` method works nearly the same as with `MySQLDB._mysql`_::
550550

551551
import MySQLdb
552552
db=MySQLdb.connect(passwd="moonpie",db="thangs")

0 commit comments

Comments
 (0)