[Jython-checkins] SF.net SVN: jython:[5819] trunk/jython/src/org/python

[<cg...@us...>]

Revision: 5819
          http://jython.svn.sourceforge.net/jython/?rev=5819&view=rev
Author:   cgroves
Date:     2008-12-31 21:36:03 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
Abbreviating package to pkg makes it sound like it's going in a field named
pkg.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ClasspathPyImporter.java
    trunk/jython/src/org/python/core/util/importer.java
    trunk/jython/src/org/python/modules/zipimport/zipimporter.java

Modified: trunk/jython/src/org/python/core/ClasspathPyImporter.java
===================================================================
--- trunk/jython/src/org/python/core/ClasspathPyImporter.java	2008-12-30 21:09:17 UTC (rev 5818)
+++ trunk/jython/src/org/python/core/ClasspathPyImporter.java	2008-12-31 21:36:03 UTC (rev 5819)
@@ -110,7 +110,7 @@
     }
 
     @Override
-    protected String makePkgPath(String fullname) {
+    protected String makePackagePath(String fullname) {
         return path;
     }
 

Modified: trunk/jython/src/org/python/core/util/importer.java
===================================================================
--- trunk/jython/src/org/python/core/util/importer.java	2008-12-30 21:09:17 UTC (rev 5818)
+++ trunk/jython/src/org/python/core/util/importer.java	2008-12-31 21:36:03 UTC (rev 5819)
@@ -46,7 +46,7 @@
      * Returns the value to fill in __path__ on a module with the given full module name created by
      * this importer.
      */
-    protected abstract String makePkgPath(String fullname);
+    protected abstract String makePackagePath(String fullname);
 
     /**
      * Given a full module name, return the potential file path in the archive (without extension).
@@ -95,7 +95,7 @@
         if (moduleCodeData.ispackage) {
             // add __path__ to the module *before* the code gets executed
             PyList pkgpath = new PyList();
-            pkgpath.add(makePkgPath(fullname));
+            pkgpath.add(makePackagePath(fullname));
             mod.__dict__.__setitem__("__path__", pkgpath);
         }
         imp.createFromCode(fullname, moduleCodeData.code, moduleCodeData.path);
@@ -155,7 +155,7 @@
      */
     protected final ModuleCodeData getModuleCode(String fullname) {
         String path = makeFilename(fullname);
-        String fullPath = makePkgPath(fullname);
+        String fullPath = makePackagePath(fullname);
 
         if (path.length() < 0) {
             return null;

Modified: trunk/jython/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-12-30 21:09:17 UTC (rev 5818)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-12-31 21:36:03 UTC (rev 5819)
@@ -418,7 +418,7 @@
     }
 
     @Override
-    protected String makePkgPath(String fullname) {
+    protected String makePackagePath(String fullname) {
         return archive + File.separator + prefix + getSubname(fullname);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.