Make epydoc generation work and update documentation

4c3ec00b · William Tisäter · 054066d5 · 4c3ec00b · 4c3ec00b · 4c3ec00b
Commit 4c3ec00b authored Sep 20, 2012 by William Tisäter
18 changed files
--- a/apidocs/html/class-tree.html
+++ b/apidocs/html/class-tree.html
@@ -123,7 +123,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/help.html
+++ b/apidocs/html/help.html
@@ -256,7 +256,7 @@ page was last updated. </p>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/identifier-index.html
+++ b/apidocs/html/identifier-index.html
@@ -437,7 +437,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/module-tree.html
+++ b/apidocs/html/module-tree.html
@@ -99,7 +99,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip-module.html
+++ b/apidocs/html/pygeoip-module.html
@@ -239,7 +239,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip-pysrc.html
+++ b/apidocs/html/pygeoip-pysrc.html
@@ -91,22 +91,22 @@
 <a name="L29"></a><tt class="py-lineno"> 29</tt>  <tt class="py-line"> </tt>
 <a name="L30"></a><tt class="py-lineno"> 30</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt class="py-name">__future__</tt> <tt class="py-keyword">import</tt> <tt class="py-name">with_statement</tt><tt class="py-op">,</tt> <tt class="py-name">division</tt> </tt>
 <a name="L31"></a><tt class="py-lineno"> 31</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">os</tt> </tt>
-<a name="L32"></a><tt class="py-lineno"> 32</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">math</tt> </tt>
-<a name="L33"></a><tt class="py-lineno"> 33</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">socket</tt> </tt>
-<a name="L34"></a><tt class="py-lineno"> 34</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">mmap</tt> </tt>
-<a name="L35"></a><tt class="py-lineno"> 35</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">gzip</tt> </tt>
-<a name="L36"></a><tt class="py-lineno"> 36</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">codecs</tt> </tt>
-<a name="L37"></a><tt class="py-lineno"> 37</tt>  <tt class="py-line"> </tt>
-<a name="L38"></a><tt class="py-lineno"> 38</tt>  <tt class="py-line"><tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
-<a name="L39"></a><tt class="py-lineno"> 39</tt>  <tt class="py-line">    <tt class="py-keyword">from</tt> <tt class="py-name">StringIO</tt> <tt class="py-keyword">import</tt> <tt class="py-name">StringIO</tt> </tt>
-<a name="L40"></a><tt class="py-lineno"> 40</tt>  <tt class="py-line"><tt class="py-keyword">except</tt> <tt class="py-name">ImportError</tt><tt class="py-op">:</tt> </tt>
-<a name="L41"></a><tt class="py-lineno"> 41</tt>  <tt class="py-line">    <tt class="py-keyword">from</tt> <tt class="py-name">io</tt> <tt class="py-keyword">import</tt> <tt class="py-name">StringIO</tt> </tt>
-<a name="L42"></a><tt class="py-lineno"> 42</tt>  <tt class="py-line"> </tt>
-<a name="L43"></a><tt class="py-lineno"> 43</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt id="link-0" class="py-name" targets="Module pygeoip.const=pygeoip.const-module.html"><a title="pygeoip.const" class="py-name" href="#" onclick="return doclink('link-0', 'const', 'link-0');">const</a></tt> </tt>
-<a name="L44"></a><tt class="py-lineno"> 44</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-1" class="py-name" targets="Module pygeoip.util=pygeoip.util-module.html"><a title="pygeoip.util" class="py-name" href="#" onclick="return doclink('link-1', 'util', 'link-1');">util</a></tt> <tt class="py-keyword">import</tt> <tt id="link-2" class="py-name" targets="Function pygeoip.util.ip2long()=pygeoip.util-module.html#ip2long"><a title="pygeoip.util.ip2long" class="py-name" href="#" onclick="return doclink('link-2', 'ip2long', 'link-2');">ip2long</a></tt> </tt>
-<a name="L45"></a><tt class="py-lineno"> 45</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-3" class="py-name" targets="Module pygeoip.timezone=pygeoip.timezone-module.html"><a title="pygeoip.timezone" class="py-name" href="#" onclick="return doclink('link-3', 'timezone', 'link-3');">timezone</a></tt> <tt class="py-keyword">import</tt> <tt id="link-4" class="py-name" targets="Function pygeoip.timezone.time_zone_by_country_and_region()=pygeoip.timezone-module.html#time_zone_by_country_and_region"><a title="pygeoip.timezone.time_zone_by_country_and_region" class="py-name" href="#" onclick="return doclink('link-4', 'time_zone_by_country_and_region', 'link-4');">time_zone_by_country_and_region</a></tt> </tt>
-<a name="L46"></a><tt class="py-lineno"> 46</tt>  <tt class="py-line"> </tt>
-<a name="L47"></a><tt class="py-lineno"> 47</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">six</tt> </tt>
+<a name="L32"></a><tt class="py-lineno"> 32</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">six</tt> </tt>
+<a name="L33"></a><tt class="py-lineno"> 33</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">math</tt> </tt>
+<a name="L34"></a><tt class="py-lineno"> 34</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">socket</tt> </tt>
+<a name="L35"></a><tt class="py-lineno"> 35</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">mmap</tt> </tt>
+<a name="L36"></a><tt class="py-lineno"> 36</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">gzip</tt> </tt>
+<a name="L37"></a><tt class="py-lineno"> 37</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt class="py-name">codecs</tt> </tt>
+<a name="L38"></a><tt class="py-lineno"> 38</tt>  <tt class="py-line"> </tt>
+<a name="L39"></a><tt class="py-lineno"> 39</tt>  <tt class="py-line"><tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
+<a name="L40"></a><tt class="py-lineno"> 40</tt>  <tt class="py-line">    <tt class="py-keyword">from</tt> <tt class="py-name">StringIO</tt> <tt class="py-keyword">import</tt> <tt class="py-name">StringIO</tt> </tt>
+<a name="L41"></a><tt class="py-lineno"> 41</tt>  <tt class="py-line"><tt class="py-keyword">except</tt> <tt class="py-name">ImportError</tt><tt class="py-op">:</tt> </tt>
+<a name="L42"></a><tt class="py-lineno"> 42</tt>  <tt class="py-line">    <tt class="py-keyword">from</tt> <tt class="py-name">io</tt> <tt class="py-keyword">import</tt> <tt class="py-name">StringIO</tt> </tt>
+<a name="L43"></a><tt class="py-lineno"> 43</tt>  <tt class="py-line"> </tt>
+<a name="L44"></a><tt class="py-lineno"> 44</tt>  <tt class="py-line"><tt class="py-keyword">import</tt> <tt id="link-0" class="py-name" targets="Module pygeoip.const=pygeoip.const-module.html"><a title="pygeoip.const" class="py-name" href="#" onclick="return doclink('link-0', 'const', 'link-0');">const</a></tt> </tt>
+<a name="L45"></a><tt class="py-lineno"> 45</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-1" class="py-name" targets="Module pygeoip.util=pygeoip.util-module.html"><a title="pygeoip.util" class="py-name" href="#" onclick="return doclink('link-1', 'util', 'link-1');">util</a></tt> <tt class="py-keyword">import</tt> <tt id="link-2" class="py-name" targets="Function pygeoip.util.ip2long()=pygeoip.util-module.html#ip2long"><a title="pygeoip.util.ip2long" class="py-name" href="#" onclick="return doclink('link-2', 'ip2long', 'link-2');">ip2long</a></tt> </tt>
+<a name="L46"></a><tt class="py-lineno"> 46</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-3" class="py-name" targets="Module pygeoip.timezone=pygeoip.timezone-module.html"><a title="pygeoip.timezone" class="py-name" href="#" onclick="return doclink('link-3', 'timezone', 'link-3');">timezone</a></tt> <tt class="py-keyword">import</tt> <tt id="link-4" class="py-name" targets="Function pygeoip.timezone.time_zone_by_country_and_region()=pygeoip.timezone-module.html#time_zone_by_country_and_region"><a title="pygeoip.timezone.time_zone_by_country_and_region" class="py-name" href="#" onclick="return doclink('link-4', 'time_zone_by_country_and_region', 'link-4');">time_zone_by_country_and_region</a></tt> </tt>
+<a name="L47"></a><tt class="py-lineno"> 47</tt>  <tt class="py-line"> </tt>
 <a name="L48"></a><tt class="py-lineno"> 48</tt>  <tt class="py-line"> </tt>
 <a name="L49"></a><tt class="py-lineno"> 49</tt>  <tt class="py-line"><tt id="link-5" class="py-name" targets="Variable pygeoip.MMAP_CACHE=pygeoip-module.html#MMAP_CACHE,Variable pygeoip.const.MMAP_CACHE=pygeoip.const-module.html#MMAP_CACHE"><a title="pygeoip.MMAP_CACHE
 pygeoip.const.MMAP_CACHE" class="py-name" href="#" onclick="return doclink('link-5', 'MMAP_CACHE', 'link-5');">MMAP_CACHE</a></tt> <tt class="py-op">=</tt> <tt id="link-6" class="py-name"><a title="pygeoip.const" class="py-name" href="#" onclick="return doclink('link-6', 'const', 'link-0');">const</a></tt><tt class="py-op">.</tt><tt id="link-7" class="py-name"><a title="pygeoip.MMAP_CACHE
@@ -201,7 +201,7 @@ pygeoip.const.MEMORY_CACHE" class="py-name" href="#" onclick="return doclink('li
 <a name="L131"></a><tt class="py-lineno">131</tt>  <tt class="py-line">        <tt class="py-keyword">for</tt> <tt class="py-name">i</tt> <tt class="py-keyword">in</tt> <tt class="py-name">range</tt><tt class="py-op">(</tt><tt id="link-30" class="py-name"><a title="pygeoip.const" class="py-name" href="#" onclick="return doclink('link-30', 'const', 'link-0');">const</a></tt><tt class="py-op">.</tt><tt id="link-31" class="py-name" targets="Variable pygeoip.const.STRUCTURE_INFO_MAX_SIZE=pygeoip.const-module.html#STRUCTURE_INFO_MAX_SIZE"><a title="pygeoip.const.STRUCTURE_INFO_MAX_SIZE" class="py-name" href="#" onclick="return doclink('link-31', 'STRUCTURE_INFO_MAX_SIZE', 'link-31');">STRUCTURE_INFO_MAX_SIZE</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L132"></a><tt class="py-lineno">132</tt>  <tt class="py-line">            <tt class="py-name">delim</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_filehandle</tt><tt class="py-op">.</tt><tt class="py-name">read</tt><tt class="py-op">(</tt><tt class="py-number">3</tt><tt class="py-op">)</tt> </tt>
 <a name="L133"></a><tt class="py-lineno">133</tt>  <tt class="py-line"> </tt>
-<a name="L134"></a><tt class="py-lineno">134</tt>  <tt class="py-line">            <tt class="py-keyword">if</tt> <tt class="py-name">delim</tt> <tt class="py-op">==</tt> <tt class="py-name">six</tt><tt class="py-op">.</tt><tt class="py-name">u</tt><tt class="py-op">(</tt><tt class="py-name">chr</tt><tt class="py-op">(</tt><tt class="py-number">255</tt><tt class="py-op">)</tt> <tt class="py-op">*</tt> <tt class="py-number">3</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+<a name="L134"></a><tt class="py-lineno">134</tt>  <tt class="py-line">            <tt class="py-keyword">if</tt> <tt class="py-name">delim</tt> <tt class="py-op">==</tt> <tt class="py-name">six</tt><tt class="py-op">.</tt><tt class="py-name">b</tt><tt class="py-op">(</tt><tt class="py-name">chr</tt><tt class="py-op">(</tt><tt class="py-number">255</tt><tt class="py-op">)</tt> <tt class="py-op">*</tt> <tt class="py-number">3</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L135"></a><tt class="py-lineno">135</tt>  <tt class="py-line">                <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_databaseType</tt> <tt class="py-op">=</tt> <tt class="py-name">ord</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_filehandle</tt><tt class="py-op">.</tt><tt class="py-name">read</tt><tt class="py-op">(</tt><tt class="py-number">1</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L136"></a><tt class="py-lineno">136</tt>  <tt class="py-line"> </tt>
 <a name="L137"></a><tt class="py-lineno">137</tt>  <tt class="py-line">                <tt class="py-keyword">if</tt> <tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_databaseType</tt> <tt class="py-op">&gt;=</tt> <tt class="py-number">106</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -760,7 +760,7 @@ expandto(location.href);
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.GeoIP-class.html
+++ b/apidocs/html/pygeoip.GeoIP-class.html
@@ -1026,7 +1026,7 @@ object --+
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.GeoIPBase-class.html
+++ b/apidocs/html/pygeoip.GeoIPBase-class.html
@@ -167,7 +167,7 @@ object --+
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.GeoIPError-class.html
+++ b/apidocs/html/pygeoip.GeoIPError-class.html
@@ -177,7 +177,7 @@ exceptions.BaseException --+
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.GeoIPMetaclass-class.html
+++ b/apidocs/html/pygeoip.GeoIPMetaclass-class.html
@@ -337,7 +337,7 @@ object --+
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.const-module.html
+++ b/apidocs/html/pygeoip.const-module.html
@@ -538,7 +538,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.const-pysrc.html
+++ b/apidocs/html/pygeoip.const-pysrc.html
@@ -482,7 +482,7 @@ expandto(location.href);
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.timezone-module.html
+++ b/apidocs/html/pygeoip.timezone-module.html
@@ -212,7 +212,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.timezone-pysrc.html
+++ b/apidocs/html/pygeoip.timezone-pysrc.html
@@ -760,23 +760,22 @@
 <a name="L697"></a><tt class="py-lineno">697</tt>  <tt class="py-line"><tt id="link-694" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-694', '_country', 'link-0');">_country</a></tt><tt class="py-op">[</tt><tt class="py-string">"ZM"</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-string">"Africa/Lusaka"</tt> </tt>
 <a name="L698"></a><tt class="py-lineno">698</tt>  <tt class="py-line"><tt id="link-695" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-695', '_country', 'link-0');">_country</a></tt><tt class="py-op">[</tt><tt class="py-string">"ZW"</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-string">"Africa/Harare"</tt> </tt>
 <a name="L699"></a><tt class="py-lineno">699</tt>  <tt class="py-line"> </tt>
-<a name="L700"></a><tt class="py-lineno">700</tt>  <tt class="py-line"> </tt>
-<a name="time_zone_by_country_and_region"></a><div id="time_zone_by_country_and_region-def"><a name="L701"></a><tt class="py-lineno">701</tt> <a class="py-toggle" href="#" id="time_zone_by_country_and_region-toggle" onclick="return toggle('time_zone_by_country_and_region');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="pygeoip.timezone-module.html#time_zone_by_country_and_region">time_zone_by_country_and_region</a><tt class="py-op">(</tt><tt class="py-param">country_code</tt><tt class="py-op">,</tt> <tt class="py-param">region_name</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="time_zone_by_country_and_region-collapsed" style="display:none;" pad="+++" indent="++++"></div><div id="time_zone_by_country_and_region-expanded"><a name="L702"></a><tt class="py-lineno">702</tt>  <tt class="py-line"> </tt>
-<a name="L703"></a><tt class="py-lineno">703</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">country_code</tt> <tt class="py-keyword">not</tt> <tt class="py-keyword">in</tt> <tt id="link-696" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-696', '_country', 'link-0');">_country</a></tt><tt class="py-op">:</tt> </tt>
-<a name="L704"></a><tt class="py-lineno">704</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">None</tt> </tt>
-<a name="L705"></a><tt class="py-lineno">705</tt>  <tt class="py-line"> </tt>
-<a name="L706"></a><tt class="py-lineno">706</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">region_name</tt> <tt class="py-keyword">or</tt> <tt class="py-name">region_name</tt> <tt class="py-op">==</tt> <tt class="py-string">'00'</tt><tt class="py-op">:</tt> </tt>
-<a name="L707"></a><tt class="py-lineno">707</tt>  <tt class="py-line">        <tt class="py-name">region_name</tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
-<a name="L708"></a><tt class="py-lineno">708</tt>  <tt class="py-line"> </tt>
-<a name="L709"></a><tt class="py-lineno">709</tt>  <tt class="py-line">    <tt class="py-name">timezones</tt> <tt class="py-op">=</tt> <tt id="link-697" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-697', '_country', 'link-0');">_country</a></tt><tt class="py-op">[</tt><tt class="py-name">country_code</tt><tt class="py-op">]</tt> </tt>
-<a name="L710"></a><tt class="py-lineno">710</tt>  <tt class="py-line"> </tt>
-<a name="L711"></a><tt class="py-lineno">711</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">timezones</tt><tt class="py-op">,</tt> <tt class="py-name">str</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L712"></a><tt class="py-lineno">712</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">timezones</tt> </tt>
-<a name="L713"></a><tt class="py-lineno">713</tt>  <tt class="py-line"> </tt>
-<a name="L714"></a><tt class="py-lineno">714</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">region_name</tt><tt class="py-op">:</tt> </tt>
-<a name="L715"></a><tt class="py-lineno">715</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">timezones</tt><tt class="py-op">.</tt><tt class="py-name">get</tt><tt class="py-op">(</tt><tt class="py-name">region_name</tt><tt class="py-op">)</tt> </tt>
-</div><a name="L716"></a><tt class="py-lineno">716</tt>  <tt class="py-line"> </tt><script type="text/javascript">
+<a name="time_zone_by_country_and_region"></a><div id="time_zone_by_country_and_region-def"><a name="L700"></a><tt class="py-lineno">700</tt> <a class="py-toggle" href="#" id="time_zone_by_country_and_region-toggle" onclick="return toggle('time_zone_by_country_and_region');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="pygeoip.timezone-module.html#time_zone_by_country_and_region">time_zone_by_country_and_region</a><tt class="py-op">(</tt><tt class="py-param">country_code</tt><tt class="py-op">,</tt> <tt class="py-param">region_name</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+</div><div id="time_zone_by_country_and_region-collapsed" style="display:none;" pad="+++" indent="++++"></div><div id="time_zone_by_country_and_region-expanded"><a name="L701"></a><tt class="py-lineno">701</tt>  <tt class="py-line"> </tt>
+<a name="L702"></a><tt class="py-lineno">702</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">country_code</tt> <tt class="py-keyword">not</tt> <tt class="py-keyword">in</tt> <tt id="link-696" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-696', '_country', 'link-0');">_country</a></tt><tt class="py-op">:</tt> </tt>
+<a name="L703"></a><tt class="py-lineno">703</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">None</tt> </tt>
+<a name="L704"></a><tt class="py-lineno">704</tt>  <tt class="py-line"> </tt>
+<a name="L705"></a><tt class="py-lineno">705</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">region_name</tt> <tt class="py-keyword">or</tt> <tt class="py-name">region_name</tt> <tt class="py-op">==</tt> <tt class="py-string">'00'</tt><tt class="py-op">:</tt> </tt>
+<a name="L706"></a><tt class="py-lineno">706</tt>  <tt class="py-line">        <tt class="py-name">region_name</tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
+<a name="L707"></a><tt class="py-lineno">707</tt>  <tt class="py-line"> </tt>
+<a name="L708"></a><tt class="py-lineno">708</tt>  <tt class="py-line">    <tt class="py-name">timezones</tt> <tt class="py-op">=</tt> <tt id="link-697" class="py-name"><a title="pygeoip.timezone._country" class="py-name" href="#" onclick="return doclink('link-697', '_country', 'link-0');">_country</a></tt><tt class="py-op">[</tt><tt class="py-name">country_code</tt><tt class="py-op">]</tt> </tt>
+<a name="L709"></a><tt class="py-lineno">709</tt>  <tt class="py-line"> </tt>
+<a name="L710"></a><tt class="py-lineno">710</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">timezones</tt><tt class="py-op">,</tt> <tt class="py-name">str</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+<a name="L711"></a><tt class="py-lineno">711</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">timezones</tt> </tt>
+<a name="L712"></a><tt class="py-lineno">712</tt>  <tt class="py-line"> </tt>
+<a name="L713"></a><tt class="py-lineno">713</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">region_name</tt><tt class="py-op">:</tt> </tt>
+<a name="L714"></a><tt class="py-lineno">714</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">timezones</tt><tt class="py-op">.</tt><tt class="py-name">get</tt><tt class="py-op">(</tt><tt class="py-name">region_name</tt><tt class="py-op">)</tt> </tt>
+</div><a name="L715"></a><tt class="py-lineno">715</tt>  <tt class="py-line"> </tt><script type="text/javascript">
 <!--
 expandto(location.href);
 // -->
@@ -814,7 +813,7 @@ expandto(location.href);
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:05 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.util-module.html
+++ b/apidocs/html/pygeoip.util-module.html
@@ -216,7 +216,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/apidocs/html/pygeoip.util-pysrc.html
+++ b/apidocs/html/pygeoip.util-pysrc.html
@@ -140,7 +140,7 @@ expandto(location.href);
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
  <tr>
    <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Sep 20 11:41:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep 20 17:58:04 2012
    </td>
    <td align="right" class="footer">
      <a target="mainFrame" href="http://epydoc.sourceforge.net"

--- a/config.ini
+++ b/config.ini
--- a/pygeoip/__init__.py
+++ b/pygeoip/__init__.py
@@ -27,8 +27,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/lgpl.txt>.
 """

-from __future__ import with_statement, absolute_import, division
+from __future__ import with_statement, division
 import os
+import six
 import math
 import socket
 import mmap
@@ -40,21 +41,21 @@ try:
 except ImportError:
    from io import StringIO

-from . import const
-from .util import ip2long
-from .timezone import time_zone_by_country_and_region
+import const
+from util import ip2long
+from timezone import time_zone_by_country_and_region

-import six

 MMAP_CACHE = const.MMAP_CACHE
 MEMORY_CACHE = const.MEMORY_CACHE
 STANDARD = const.STANDARD

+
 class GeoIPError(Exception):
    pass

-class GeoIPMetaclass(type):

+class GeoIPMetaclass(type):
    def __new__(cls, *args, **kwargs):
        """
        Singleton method to gets an instance without reparsing the db. Unique
@@ -77,10 +78,11 @@ class GeoIPMetaclass(type):

        return cls._instances[filename]

+
 GeoIPBase = GeoIPMetaclass('GeoIPBase', (object,), {})

-class GeoIP(GeoIPBase):

+class GeoIP(GeoIPBase):
    def __init__(self, filename, flags=0):
        """
        Initialize the class.
@@ -617,8 +619,8 @@ class GeoIP(GeoIPBase):
        Look up the time zone for a given IP address.
        Use this method if you have a Region or City database.

-        @param hostname: IP address
-        @type hostname: str
+        @param addr: IP address
+        @type addr: str
        @return: Time zone
        @rtype: str
        """